Patchwork [1,of,3] svnsubrepo: decorate dirty method with annotatesubrepoerror

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date Jan. 16, 2018, 1:42 p.m.
Message ID <fde3cd2487e1f4d5867b.1516110135@Iris>
Download mbox | patch
Permalink /patch/26784/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - Jan. 16, 2018, 1:42 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1515949528 18000
#      Sun Jan 14 12:05:28 2018 -0500
# Node ID fde3cd2487e1f4d5867bf8c6e79139b6fe475779
# Parent  58fda95a0202fc6327d1f5d9df26f7ff16538d57
svnsubrepo: decorate dirty method with annotatesubrepoerror

This function invokes svn commands which can error out in any number
of ways, so it's helpful to know in which subrepo this error happens.
Yuya Nishihara - Jan. 17, 2018, 1:14 p.m.
On Tue, 16 Jan 2018 08:42:15 -0500, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1515949528 18000
> #      Sun Jan 14 12:05:28 2018 -0500
> # Node ID fde3cd2487e1f4d5867bf8c6e79139b6fe475779
> # Parent  58fda95a0202fc6327d1f5d9df26f7ff16538d57
> svnsubrepo: decorate dirty method with annotatesubrepoerror

Looks good. Queued, thanks.

Patch

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -1331,6 +1331,7 @@  class svnsubrepo(abstractsubrepo):
                     return True, True, bool(missing)
         return bool(changes), False, bool(missing)
 
+    @annotatesubrepoerror
     def dirty(self, ignoreupdate=False, missing=False):
         wcchanged = self._wcchanged()
         changed = wcchanged[0] or (missing and wcchanged[2])