Commit Graph

146 Commits

Author SHA1 Message Date
Ryan McElroy
a16fec1144 tracking: refactor rebase setup 2015-03-13 22:12:55 -07:00
Ryan McElroy
2d8819a1ce activepath: guard against non-string rpath from hgsvn 2015-03-13 18:10:49 -07:00
Ryan McElroy
36afdfef47 clonecmd: implement --mirror option 2015-03-13 18:02:21 -07:00
Ryan McElroy
8c2ad00baf bookmarks: allow restricted bookmarks to be deleted 2015-03-13 17:37:05 -07:00
Ryan McElroy
48e874430b pullcmd: un-rename explicitly passed path 2015-03-13 17:17:49 -07:00
Ryan McElroy
0b8d3f2cca pushcmd: un-rename explicitly passed path 2015-03-13 17:20:31 -07:00
Ryan McElroy
e876f1f407 pushrev: no default pushrev for normal pushes 2015-03-13 15:50:02 -07:00
Sean Farley
6c7b4559aa bookmarks: add --untrack 2015-03-13 20:38:55 -07:00
Sean Farley
a4ce54ef72 bookmarks: when deleting a bookmark also delete the tracking 2015-03-13 18:02:03 -07:00
Sean Farley
e1e42f31c3 paths: remove deleted path from remotenames 2015-03-13 17:51:29 -07:00
Sean Farley
83f7bb590e saveremotenames: remove old keys from _remotenames dictionary 2015-03-13 17:50:35 -07:00
Sean Farley
d8a8a70124 saveremotenames: make branches and bookmarks optional 2015-03-13 16:57:19 -07:00
Sean Farley
ac2a40916f saveremotenames: use vfs instead of bare file operations 2015-03-13 16:43:13 -07:00
Sean Farley
23afd24cfe paths: add ability to add a new path 2015-03-13 16:39:30 -07:00
Sean Farley
4903ea535c paths: add ability to remove a path 2015-03-13 15:57:43 -07:00
Sean Farley
8e36deed33 expull: remove extra writedistance 2015-03-13 14:31:37 -07:00
Sean Farley
3cbda10437 writedistance: fix logic for continuing to calculate the distance
Previously, we wouldn't calculate the distance if the cache file didn't exist
because both calls were in the same try block. The patch separates them into
their own try blocks.
2015-03-13 14:31:26 -07:00
Sean Farley
ba7b903694 bookmarks: writedistance when tracking is setup 2015-03-13 17:54:40 -07:00
Sean Farley
df833302a5 bookmarks: show 'bookmark or remote name' in tracking help 2015-03-13 13:40:41 -07:00
Sean Farley
d36fa59365 saveremotenames: delete old remotedistance file 2015-03-13 13:32:15 -07:00
Sean Farley
a16d73cfa6 writedistance: fix updating after push and pull 2015-03-13 13:21:29 -07:00
Sean Farley
09cda42cf1 writedistance: add experimental feature for displaying the active bookmark
This might be not be a good idea but in simple cases seems to be ok. The idea
can be seen with the following example:

o  4906 sean foo
|  4
@  746a sean
|  asdf
o  012a sean baz
|  3
o  a9e7 sean
|  2
| o  407e sean bar
|/   1
o  7171 sean
   0

Changeset 746a has one unambiguous head that is a bookmark, so we can consider
ourselves to be one changeset behind 'foo'.
2015-03-12 17:38:27 -07:00
Sean Farley
bb7e93360b bookmarks: display tracking info when -v is passed 2015-03-12 16:27:39 -07:00
Sean Farley
e947a03641 writedistance: use tracking information to cache distance 2015-03-12 16:48:30 -07:00
Sean Farley
b5b21674df histedit: add writedistance 2015-03-12 16:50:27 -07:00
Sean Farley
a4b31b10fd strip: add writedistance 2015-03-12 15:55:16 -07:00
Sean Farley
efba5915be bookmarks: copy more code from commands.py; no real code change 2015-03-12 12:54:08 -07:00
Sean Farley
76c447a1f9 check-code: clean up 2015-03-12 12:53:08 -07:00
Ryan McElroy
a1eca32902 tracking: deal with renamed paths properly 2015-03-12 00:06:11 -07:00
Ryan McElroy
dab4801b96 tracking: use tracking for pushes 2015-03-11 17:24:01 -07:00
Ryan McElroy
3122dd1da2 tracking: use tracking when rebasing 2015-03-11 15:38:19 -07:00
Ryan McElroy
87def048ff tracking: read and write bookmarks.tracking file 2015-03-11 15:16:53 -07:00
Ryan McElroy
6861bd8358 tracking: add UI to bookmarks 2015-03-11 14:57:32 -07:00
Ryan McElroy
e311cf8540 push: no need to acquire lock twice 2015-03-11 14:48:08 -07:00
Sean Farley
412589cee8 check-code: remove %s from inside _() 2015-03-11 14:33:56 -07:00
Ryan McElroy
3d76fbdb26 push: ensure anonymous heads always printed in same order 2015-03-10 20:41:04 -07:00
Ryan McElroy
ffb6f34b75 transition: implement disallowed bookmark names 2015-03-10 20:38:03 -07:00
Ryan McElroy
766d2965f6 push: introduce default push rev 2015-03-10 00:06:51 -07:00
Ryan McElroy
bb98a4d23f push: move --delete above --to block 2015-03-09 23:37:13 -07:00
Sean Farley
74b3b4afd8 push: add --delete 2015-03-09 17:36:25 -07:00
Sean Farley
762e2690c7 whitespace: add some padding around hoist namemap and remove trailing newline 2015-03-09 13:24:34 -07:00
Sean Farley
5e7e9ea089 check-code: add missing _() to ui.note 2015-03-09 13:12:23 -07:00
Sean Farley
8a51246566 check-code: explicitly catch AttributeError 2015-03-09 13:11:37 -07:00
Ryan McElroy
caa77acd3b transition: shorten hoistremotebookmarks option to hoist 2015-03-03 01:11:47 -08:00
Ryan McElroy
29ec9f351a transition: allow bookmarks to be deleted 2015-03-03 01:08:44 -08:00
Ryan McElroy
c145f253d6 expush: use pullremotenames 2015-03-02 23:56:57 -08:00
Ryan McElroy
660c2f3f4f activepath: remove broken exception handler
This could not have possibly worked; it would have failed to read the undefined
'path' variable. REmove it to avoid confusion and properly propogate errors.
2015-03-02 23:47:42 -08:00
Ryan McElroy
09407c3ac0 remotenames: implement remote renaming 2015-03-02 23:22:51 -08:00
Ryan McElroy
b683e2f755 bookmarks: implement remote bookmark hoisting 2015-02-20 01:27:49 -08:00
Sean Farley
a7c4bc8f7d pushdiscovery: don't list closed heads either 2015-02-26 14:36:34 -08:00