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

rebase: adds storing collapse message (issue4792)...

rebase: adds storing collapse message (issue4792) Before this patch collapse message wasn't stored so when you ran into the merge conflict while rebasing, running rebase --continue didn't remember the message and always opened editor to fill commit message. This patch adds saving collapse message in .hg/last-message.txt and restoring it later when needed.

Peter Arrenbrecht - - Load All Authors

File last commit:

r6439:c1b47c0f default


                r28185:c7e89486

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