Commit Graph

112 Commits

Author SHA1 Message Date
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
Sean Farley
793e669940 pushdiscovery: show -f for overriding anonymous heads push 2015-02-13 16:06:16 -08:00
Sean Farley
5f67c46076 pushdiscovery: allow anonymous heads to be pushed with -f
Test coverage has been added.
2015-02-13 13:34:32 -08:00
Sean Farley
428134b618 pushdiscovery: remove remote heads that are already local
Previously, if push had nothing to send it would still abort because we weren't
removing heads that we already had (and wouldn't push anyway).
2015-02-13 09:53:58 -08:00
Sean Farley
c93d5221d0 pushdiscovery: remove heads that advance bookmarks from anonymous check
Test coverage has been added.
2015-02-12 20:59:17 -08:00
Sean Farley
b4ea9f221f pushdiscovery: consolidate if-blocks; no logic is changing 2015-02-12 20:58:27 -08:00
Sean Farley
1e7dfb9d59 pushdiscovery: indent code to prepare for logic change 2015-02-12 20:56:14 -08:00
Sean Farley
5824bd31a3 pushdiscovery: only abort if there are non-obsolete heads 2015-02-12 20:54:50 -08:00
Sean Farley
0d550cd9f6 pushdiscovery: remove unneeded revrange
When expushdiscovery is called the list of revs has already been resolved.
2015-02-12 18:11:00 -08:00
Sean Farley
24beffb621 upstream: allow passing in a list of remote servers (BC) 2015-02-26 14:31:31 -08:00
Sean Farley
a2f26f5b94 upstream: change default behavior to use default path (BC)
Tests have been updated.
2015-02-26 14:05:15 -08:00
Sean Farley
880dc7c811 upstream: use splitremotename instead of hardcoding '/' 2015-02-26 13:37:00 -08:00
Sean Farley
0b7e8bec8b upstream: operate on an unfiltered repo to avoid aborting 2015-02-26 14:30:58 -08:00
Sean Farley
efe7db9db1 push: only list non-obsolete heads in ui message 2015-02-12 13:24:41 -08:00
Ryan McElroy
5f5b92c7c3 pushto: translatable abort messages and hints 2015-02-11 23:53:22 -08:00
Ryan McElroy
73be4de23e pushto: do not abort on no-op pushes 2015-02-11 23:41:42 -08:00
Ryan McElroy
1a3f91d0c3 pushto: consider all foreground nodes, not just descendants 2015-02-11 23:34:56 -08:00
Ryan McElroy
ccecf9e730 push: translate status 2015-02-11 22:31:27 -08:00
Ryan McElroy
375be87c13 pushto: reuse info passed through pushop 2015-02-11 20:09:29 -08:00
Ryan McElroy
a4dd3a7c4a push: use unfiltered repo 2015-02-11 19:56:36 -08:00
Ryan McElroy
d8f73fb505 push: properly limit anonymous heads 2015-02-11 19:54:34 -08:00
Ryan McElroy
dfcaf81724 push: only check for anonymous heads when --to is not specified 2015-02-11 19:03:28 -08:00
Sean Farley
bbab829708 push: abort if pushing only contains local bookmarks 2015-02-11 09:22:26 -08:00
Ryan McElroy
9327a466ed remotenames: reduce verbosity 2015-02-11 22:31:14 -08:00
Ryan McElroy
bccfcf4eaa push: rename force.to to forceto for consistency 2015-02-11 18:18:56 -08:00
Sean Farley
444014356c debug: use repo.ui instead of ui from older version of code 2015-02-10 17:00:47 -08:00
Ryan McElroy
67dc7dfe8f remotenames: make loading module side-effect free 2015-02-10 12:02:58 -08:00
Ryan McElroy
eb7e17b93e pushto: abort with nice message if push would have no effect 2015-02-10 12:02:32 -08:00
Ryan McElroy
5fbd0652a5 remotenames: implement push --to functionality 2015-02-10 11:52:19 -08:00
Ryan McElroy
fa62dbc7c6 remotenames: alphabetize imports 2015-02-10 11:43:07 -08:00
Sean Farley
8927ab8bcf log: add --remote option
Previously, we had a config knob that would unhide obsolete changesets if they
had a remote name pointing to them. This had the side effect of 1) being an
all-or-nothing config 2) requiring a hack to re-hide the changesets during a
push.

This patch adds an option to log (the only place, so far, where it makes sense
to unhide these changesets).
2015-02-10 09:15:37 -08:00
Sean Farley
e14cb0d306 push: write distance 2015-02-09 20:59:50 -08:00
Sean Farley
61ae60e640 bookmarks: write distance 2015-02-09 20:38:30 -08:00
Sean Farley
407fb12f30 distance: use alias if that config is set
The case of setting this option *after* already having the remote names file
written is not handled yet.
2015-02-09 20:25:23 -08:00
Sean Farley
f548b1a20c update: write distance 2015-02-09 20:16:15 -08:00