Mercurial > hg-stable

changeset 13432:5a5bd7614401 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: break long line found by check-code
author Martin Geisler <mg@aragost.com>
date Thu, 17 Feb 2011 09:20:44 +0100
parents 69c773750055
children 0b1bbc46516e
files mercurial/subrepo.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Thu Feb 17 09:19:15 2011 +0100
+++ b/mercurial/subrepo.py	Thu Feb 17 09:20:44 2011 +0100
@@ -886,7 +886,8 @@
         if self.dirty():
             if self._gitstate() != revision:
                 dirty = self._gitstate() == self._state[1] or code != 0
-                if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]):
+                if _updateprompt(self._ui, self, dirty,
+                                 self._state[1][:7], revision[:7]):
                     mergefunc()
         else:
             mergefunc()