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-absorb-unfinished.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 05 Apr 2024 11:33:47 +0200
changeset 51580 b70628a9aa7e
parent 45840 527ce85c2e60
permissions -rw-r--r--
phases: use revision number in new_heads All graph operations will be done using revision numbers, so passing nodes only means they will eventually get converted to revision numbers internally. As part of an effort to align the code on using revision number we make the `phases.newheads` function operated on revision number, taking them as input and using them in returns, instead of the node-id it used to consume and produce. This is part of multiple changesets effort to translate more part of the logic, but is done step by step to facilitate the identification of issue that might arise in mercurial core and extensions. To make the change simpler to handle for third party extensions, we also rename the function, using a more modern form. This will help detecting the different between the node-id version and the rev-num version. I also take this as an opportunity to add some comment about possible performance improvement for the future. They don't matter too much now, but they are worse exploring in a while.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
42128
537a8aeb9977 absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff changeset 
     1
 
  $ cat >> $HGRCPATH << EOF
537a8aeb9977 absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff changeset 
     2
 
  > [extensions]
537a8aeb9977 absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff changeset 
     3
 
  > absorb=
537a8aeb9977 absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff changeset 
     4
 
  > EOF
537a8aeb9977 absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff changeset 
     5
 












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




     6


Abort absorb if there is an unfinished operation.












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




     7














537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




     8


  $ hg init abortunresolved












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




     9


  $ cd abortunresolved












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    10














537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    11


  $ echo "foo1" > foo.whole












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    12


  $ hg commit -Aqm "foo 1"












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    13














537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    14


  $ hg update null












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    15


  0 files updated, 0 files merged, 1 files removed, 0 files unresolved












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    16


  $ echo "foo2" > foo.whole












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    17


  $ hg commit -Aqm "foo 2"












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    18














537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    19


  $ hg --config extensions.rebase= rebase -r 1 -d 0







45771






f90a5c211251
rebase: change and standarize template for rebase's one-line summary



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45215

diff
changeset




    20


  rebasing 1:c3b6dc0e177a tip "foo 2"







42128






537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    21


  merging foo.whole












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    22


  warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')







45150






dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'



Daniel Ploch <dploch@google.com>


parents: 
42128

diff
changeset




    23


  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')







45826






21733e8c924f
errors: add config that lets user get more detailed exit codes



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45771

diff
changeset




    24


  [240]







42128






537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    25














537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    26


  $ hg --config extensions.rebase= absorb












537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    27


  abort: rebase in progress







45215






a253ded5b03d
morestatus: mention --stop even if not using --verbose



Kyle Lippincott <spectral@google.com>


parents: 
45150

diff
changeset




    28


  (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')







45840






527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45826

diff
changeset




    29


  [20]







42128






537a8aeb9977
absorb: aborting if another operation is in progress



Rodrigo Damazio Bovendorp <rdamazio@google.com>


parents: 

diff
changeset




    30
















mercurial