##// END OF EJS Templates
localrepo: introduce method for explicit branch cache update...
localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.

File last commit:

r11285:f118029e default
r12066:d01e2865 default
Show More
test-rebase-parameters.out
52 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-rebase-parameters.out
Stefano Tortarolo
Add rebase extension
r6906 % These fail
% Use continue and abort
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 abort: cannot use both abort and continue
Stefano Tortarolo
Add rebase extension
r6906
% Use continue and collapse
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 abort: cannot use collapse with continue or abort
Stefano Tortarolo
Add rebase extension
r6906
% Use continue/abort and dest/source
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 abort: abort and continue do not allow specifying revisions
Stefano Tortarolo
Add rebase extension
r6906
% Use source and base
Matt Mackall
rebase: use usual util.abort rather than error.ParseError
r11285 abort: cannot specify both a revision and a base
Stefano Tortarolo
Add rebase extension
r6906
% Rebase with no arguments - from current
nothing to rebase
% Rebase with no arguments - from the current branch
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
nothing to rebase
% ----------
% These work
% Rebase with no arguments (from 3 onto 7)
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
rebase: disable rollback after rebasing
r7130 % Try to rollback after a rebase (fail)
no rollback information available
Stefano Tortarolo
Add rebase extension
r6906
% Rebase with base == '.' => same as no arguments (from 3 onto 7)
3 files updated, 0 files merged, 3 files removed, 0 files unresolved
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906
% Rebase with dest == default => same as no arguments (from 3 onto 7)
3 files updated, 0 files merged, 3 files removed, 0 files unresolved
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906
% Specify only source (from 4 onto 7)
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906
% Specify only dest (from 3 onto 6)
3 files updated, 0 files merged, 3 files removed, 0 files unresolved
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906
% Specify only base (from 3 onto 7)
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906
% Specify source and dest (from 4 onto 6)
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906
% Specify base and dest (from 3 onto 6)
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to