Sune Foldager
1465c20864
fetch: use dirstate branch instead of first parents
2008-09-24 13:22:11 +02:00
Sune Foldager
71dc05b36f
fetch: added support for named branches
...
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
2008-09-08 12:55:46 +02:00
Dirkjan Ochtman
f5856614a2
fetch: linearize code by eliminating nested functions
2008-08-28 11:19:17 +02:00
Dirkjan Ochtman
dc3b56ac83
convert comments to docstrings in a bunch of extensions
2008-06-12 11:33:47 +02:00
Bryan O'Sullivan
776bc63f5b
commit: when committing the results of a merge, it's all or nothing
...
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
2008-03-24 15:36:56 -07:00
Bryan O'Sullivan
f9f5e47a2f
fetch: don't proceed if working directory is missing files (issue988)
2008-03-11 11:38:12 -07:00
Bryan O'Sullivan
a26a2d3c66
fetch: rename --force-editor option to --edit, for consistency
2008-03-11 11:30:42 -07:00
Joel Rosdahl
4f8012378a
Remove unused imports
2008-03-06 22:23:41 +01:00
Joel Rosdahl
5dae3059a0
Expand import * to allow Pyflakes to find problems
2008-03-06 22:23:26 +01:00
Bryan O'Sullivan
7ccd4e897d
fetch: make test reproducible, tiny code cleanup
2008-03-05 09:20:57 -08:00
Bryan O'Sullivan
d160458ee9
fetch: switch the default parent used for a merge
...
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
2008-03-05 09:10:45 -08:00
Thomas Arendsen Hein
66db9ab9a2
Document log date ranges and mention 'hg help dates' for all commands (issue998)
2008-02-22 21:18:48 +01:00
Thomas Arendsen Hein
a1c1677af4
Fix bad behaviour when specifying an invalid date (issue700)
...
commit (aborts _after_ typing in a commit message)
backout (aborted after the initial revert)
tag (edited .hgtags and couldn't commit)
import (patch applied, then commit fails)
qnew (aborts on bad dates, but writes any valid date into the # Date header)
qrefresh (like qnew)
sign (like tag)
fetch (merge, merge, merge, merge, abort)
2008-02-17 21:34:28 +01:00
Bryan O'Sullivan
497bf2ca7a
fetch: hide authentication details
2008-01-04 11:58:27 -08:00
Benoit Boissinot
ce6a51c4eb
refactor options from cmdtable
...
- add extracommitopts for user and date
- factor stuff
2007-08-08 12:27:20 +02:00
Matt Mackall
3a3bd8ec5b
Make repo locks recursive, eliminate all passing of lock/wlock
2007-07-21 16:02:10 -05:00
Matt Mackall
3e13c68628
Use try/finally pattern to cleanup locks and transactions
2007-07-21 16:02:10 -05:00
Thomas Arendsen Hein
0b7147a667
Updated command tables in commands.py and hgext extensions.
...
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
2007-06-26 22:38:57 +02:00
Matt Mackall
7daba33088
dispatch: move dispatching code to cmdutil
2007-06-11 21:09:24 -05:00
Matt Mackall
296d6a7cb8
Simplify i18n imports
2006-12-14 20:25:19 -06:00
Matt Mackall
f17a4e1934
Replace demandload with new demandimport
2006-12-13 13:27:09 -06:00
Thomas Arendsen Hein
0a7b982aa6
Whitespace/Tab cleanup
2006-10-01 19:26:33 +02:00
Vadim Gelfer
bfa688e22b
fetch: fix test fail
2006-08-10 17:02:11 -07:00
Matt Mackall
76c5adea2f
Merge with crew, fix most tests
2006-08-09 13:55:18 -05:00
Vadim Gelfer
b365694c04
fetch: hold lock and wlock across all operations
2006-08-08 17:08:59 -07:00
Vadim Gelfer
fa92533acd
fetch: lock repo across pull and commit
2006-08-08 16:40:08 -07:00
Vadim Gelfer
03412632fc
fetch: drop commands.doupdate
2006-08-08 16:37:41 -07:00
Vadim Gelfer
9b3aa8dfc1
fetch: fix breakage from mpm.
...
add test so will not break again.
2006-08-08 16:09:26 -07:00
Matt Mackall
de047b03ce
Introduce update helper functions: update, merge, clean, and revert
2006-08-07 22:54:33 -05:00
Matt Mackall
5d20f724f3
Fix extensions for merge change
2006-08-07 17:26:09 -05:00
Vadim Gelfer
f653b6c12f
fetch: add missing import.
2006-08-07 19:08:55 -07:00
Vadim Gelfer
4068ec9129
fetch: do not fetch if working dir modified
2006-08-07 17:33:14 -07:00
Vadim Gelfer
d90021dfb5
new extension: fetch -> combine pull and merge/update
...
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.
2006-08-07 17:27:38 -07:00