Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue5979.t
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 18 Jan 2022 12:57:55 -0800
changeset 48756 86e4b86df932
parent 40369 ef6cab7930b3
permissions -rw-r--r--
filemerge: when not keeping premerge, don't write markers to context When premerge is enabled (as it is for non-binary inputs by default) and the markers are not kept, we currently still write it to the output context and then restore the previous content right after. With the refactoring in the previous patch, we can easily avoid that step and instead write the output in the opposite case (i.e. when it's successful or when the markers are supposed to be kept). Differential Revision: https://phab.mercurial-scm.org/D12149
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
39473
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     1
 
  $ hg init r1
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     2
 
  $ cd r1
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     3
 
  $ hg ci --config ui.allowemptycommit=true -m c0
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     4
 
  $ hg ci --config ui.allowemptycommit=true -m c1
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     5
 
  $ hg ci --config ui.allowemptycommit=true -m c2
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     6
 
  $ hg co -q 0
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     7
 
  $ hg ci --config ui.allowemptycommit=true -m c3
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     8
 
  created new head
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     9
 
  $ hg co -q 3
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
    10
 
  $ hg merge --quiet
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
    11
 
  $ hg ci --config ui.allowemptycommit=true -m c4
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
    12
 












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    13


  $ hg log -G -T'{desc}'












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    14


  @    c4












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    15


  |\












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    16


  | o  c3












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    17


  | |












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    18


  o |  c2












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    19


  | |












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    20


  o |  c1












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    21


  |/












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    22


  o  c0












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    23


  












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    24









40369






ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t



Matt Harbison <matt_harbison@yahoo.com>


parents: 
39473

diff
changeset




    25


  >>> from mercurial import hg












ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t



Matt Harbison <matt_harbison@yahoo.com>


parents: 
39473

diff
changeset




    26


  >>> from mercurial import ui as uimod












ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t



Matt Harbison <matt_harbison@yahoo.com>


parents: 
39473

diff
changeset




    27


  >>> repo = hg.repository(uimod.ui())







39473






b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    28


  >>> for anc in repo.changelog.ancestors([4], inclusive=True):












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    29


  ...   print(anc)












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    30


  4












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    31


  3












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    32


  2












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    33


  1












b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




    34


  0














mercurial