upstream/mercurial-mirror Files · tests/test-revlog-ancestry.py

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Dirkjan Ochtman - - Load All Authors

File last commit:

r11303:a1aad833 default


                r13155:f02d7a56

default

Download file

             test-revlog-ancestry.py
        
                    73 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-revlog-ancestry.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os

      from mercurial import hg, ui, merge

      u = ui.ui()

      repo = hg.repository(u, 'test1', create=1)

      os.chdir('test1')

      def commit(text, time):

          repo.commit(text=text, date="%d 0" % time)

      def addcommit(name, time):

          f = open(name, 'w')

          f.write('%s\n' % name)

          f.close()

          repo[None].add([name])

          commit(name, time)

      def update(rev):

          merge.update(repo, rev, False, True, False)

      def merge_(rev):

          merge.update(repo, rev, True, False, False)

      if __name__ == '__main__':

          addcommit("A", 0)

          addcommit("B", 1)

          update(0)

          addcommit("C", 2)

          merge_(1)

          commit("D", 3)

          update(2)

          addcommit("E", 4)

          addcommit("F", 5)

          update(3)

          addcommit("G", 6)

          merge_(5)

          commit("H", 7)

          update(5)

          addcommit("I", 8)

          # Ancestors

          print 'Ancestors of 5'

          for r in repo.changelog.ancestors(5):

              print r,

          print '\nAncestors of 6 and 5'

          for r in repo.changelog.ancestors(6, 5):

              print r,

          print '\nAncestors of 5 and 4'

          for r in repo.changelog.ancestors(5, 4):

              print r,

          # Descendants

          print '\n\nDescendants of 5'

          for r in repo.changelog.descendants(5):

              print r,

          print '\nDescendants of 5 and 3'

          for r in repo.changelog.descendants(5, 3):

              print r,

          print '\nDescendants of 5 and 4'

          for r in repo.changelog.descendants(5, 4):

              print r,

	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

				import os
				from mercurial import hg, ui, merge

				u = ui.ui()

				repo = hg.repository(u, 'test1', create=1)
				os.chdir('test1')

				def commit(text, time):
				repo.commit(text=text, date="%d 0" % time)

				def addcommit(name, time):
				f = open(name, 'w')
				f.write('%s\n' % name)
				f.close()
				repo[None].add([name])
				commit(name, time)

				def update(rev):
				merge.update(repo, rev, False, True, False)

				def merge_(rev):
				merge.update(repo, rev, True, False, False)

				if __name__ == '__main__':
				addcommit("A", 0)
				addcommit("B", 1)

				update(0)
				addcommit("C", 2)

				merge_(1)
				commit("D", 3)

				update(2)
				addcommit("E", 4)
				addcommit("F", 5)

				update(3)
				addcommit("G", 6)

				merge_(5)
				commit("H", 7)

				update(5)
				addcommit("I", 8)

				# Ancestors
				print 'Ancestors of 5'
				for r in repo.changelog.ancestors(5):
				print r,

				print '\nAncestors of 6 and 5'
				for r in repo.changelog.ancestors(6, 5):
				print r,

				print '\nAncestors of 5 and 4'
				for r in repo.changelog.ancestors(5, 4):
				print r,

				# Descendants
				print '\n\nDescendants of 5'
				for r in repo.changelog.descendants(5):
				print r,

				print '\nDescendants of 5 and 3'
				for r in repo.changelog.descendants(5, 3):
				print r,

				print '\nDescendants of 5 and 4'
				for r in repo.changelog.descendants(5, 4):
				print r,