upstream/mercurial-mirror Files · tests/svn-safe-append.py

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Peter Arrenbrecht - - Load All Authors

File last commit:

r6439:c1b47c0f default


                r22285:85bded43

default

Download file

             svn-safe-append.py
        
                    25 lines
            
             | 487 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / svn-safe-append.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.

      Without this svn will not detect workspace changes."""

      import sys, os

      text = sys.argv[1]

      fname = sys.argv[2]

      f = open(fname, "ab")

      try:

          before = os.fstat(f.fileno()).st_mtime

          f.write(text)

          f.write("\n")

      finally:

          f.close()

      inc = 1

      now = os.stat(fname).st_mtime

      while now == before:

          t = now + inc

          inc += 1

          os.utime(fname, (t, t))

          now = os.stat(fname).st_mtime

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#!/usr/bin/env python

				__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.
				Without this svn will not detect workspace changes."""

				import sys, os

				text = sys.argv[1]
				fname = sys.argv[2]

				f = open(fname, "ab")
				try:
				before = os.fstat(f.fileno()).st_mtime
				f.write(text)
				f.write("\n")
				finally:
				f.close()
				inc = 1
				now = os.stat(fname).st_mtime
				while now == before:
				t = now + inc
				inc += 1
				os.utime(fname, (t, t))
				now = os.stat(fname).st_mtime