largefiles: fix check-code errors.
authorNa'Tosha Bard <natosha@unity3d.com>
Fri, 09 Mar 2012 17:11:07 +0100
changeset 16248 51e6f318bdf1
parent 16247 d87d9d8a8e03
child 16249 0d175ac527c1
largefiles: fix check-code errors.
hgext/largefiles/overrides.py
hgext/largefiles/reposetup.py
tests/test-check-code-hg.t
--- a/hgext/largefiles/overrides.py	Fri Mar 09 16:11:52 2012 +0100
+++ b/hgext/largefiles/overrides.py	Fri Mar 09 17:11:07 2012 +0100
@@ -428,8 +428,8 @@
 
     try:
         try:
-            # When we call orig below it creates the standins but we don't add them
-            # to the dir state until later so lock during that time.
+            # When we call orig below it creates the standins but we don't add
+            # them to the dir state until later so lock during that time.
             wlock = repo.wlock()
 
             manifest = repo[None].manifest()
--- a/hgext/largefiles/reposetup.py	Fri Mar 09 16:11:52 2012 +0100
+++ b/hgext/largefiles/reposetup.py	Fri Mar 09 17:11:07 2012 +0100
@@ -313,7 +313,8 @@
                     # removed/renamed)
                     for lfile in lfiles:
                         if lfile in modifiedfiles:
-                            if os.path.exists(self.wjoin(lfutil.standin(lfile))):
+                            if os.path.exists(
+                                    self.wjoin(lfutil.standin(lfile))):
                                 # this handles the case where a rebase is being
                                 # performed and the working copy is not updated
                                 # yet.
--- a/tests/test-check-code-hg.t	Fri Mar 09 16:11:52 2012 +0100
+++ b/tests/test-check-code-hg.t	Fri Mar 09 17:11:07 2012 +0100
@@ -202,12 +202,6 @@
   hgext/keyword.py:0:
    >     ui.note("hg ci -m '%s'\n" % msg)
    warning: unwrapped ui message
-  hgext/largefiles/overrides.py:0:
-   >             # When we call orig below it creates the standins but we don't add them
-   warning: line over 80 characters
-  hgext/largefiles/reposetup.py:0:
-   >                             if os.path.exists(self.wjoin(lfutil.standin(lfile))):
-   warning: line over 80 characters
   hgext/mq.py:0:
    >                     raise util.Abort(_("cannot push --exact with applied patches"))
    warning: line over 80 characters