subrepo: append subrepo path to subrepo error messages This change appends the subrepo path to subrepo errors. That is, when there is an error performing an operation a subrepo, rather than displaying a message such as: pushing subrepo MYSUBREPO to PATH searching for changes abort: push creates new remote head HEADHASH! hint: did you forget to merge? use push -f to force mercurial will show: pushing subrepo MYSUBREPO to PATH searching for changes abort: push creates new remote head HEADHASH! (in subrepo MYSUBREPO) hint: did you forget to merge? use push -f to force The rationale for this change is that the current error messages make it hard for TortoiseHg (and similar tools) to tell the user which subrepo caused the push failure. The "(in subrepo MYSUBREPO)" message has been added to those subrepo methods were it made sense (by using a decorator). We avoid appending "(in subrepo XXX)" multiple times when subrepos are nexted by throwing a "SubrepoAbort" exception after the extra message is appended. The decorator will then "ignore" (i.e. just re-raise) the exception and never add the message again. A small drawback of this method is that part of the exception trace is lost when the exception is catched and re-raised by the annotatesubrepoerror decorator. Also, because the state() function already printed the subrepo path when it threw an error, that error has been changed to avoid duplicating the subrepo path in the error message. Note that I have also updated several subrepo related tests to reflect these changes.

     1

# RelaxNG schema for "xml" log style

     2

# Inspired by Subversion's XML log format.

     3

     4

start = log

     5

node.type = xsd:string  {minLength = "40" maxLength = "40"}

     6

     7

log = element log { logentry+ }

     8

logentry = element logentry {

     9

    logentry.attlist,

    10

    branch*, tag*, hgparent*,

    11

    author, date,

    12

    msg, paths?, copies?, extra*

    13

}

    14

logentry.attlist =

    15

    attribute revision {xsd:nonNegativeInteger}

    16

  & attribute node {node.type}

    17

branch = element branch { text }

    18

tag = element tag { text }

    19

hgparent = element parent {hgparent.attlist, text}

    20

hgparent.attlist =

    21

    attribute revision {xsd:integer {minInclusive = "-1"} }

    22

  & attribute node {node.type}

    23

author = element author { author.attlist, text }

    24

author.attlist =

    25

    attribute email {text}

    26

date = element date {xsd:dateTime}

    27

msg = element msg {msg.attlist, text}

    28

msg.attlist =

    29

    attribute xml:space {"preserve"}

    30

paths = element paths { path* }

    31

path = element path { path.attlist, text }

    32

path.attlist =

    33

    # Action: (A)dd, (M)odify, (R)emove

    34

    attribute action {"A"|"M"|"R"}

    35

copies = element copies { copy+ }

    36

copy = element copy { copy.attlist, text }

    37

copy.attlist =

    38

    attribute source {text}

    39

extra = element extra {extra.attlist, text}

    40

extra.attlist =

    41

    attribute key {text}