Commit Graph

1787 Commits

Author SHA1 Message Date
Brendan Cully
5d7f00c97d Add portable shell-quoting function; teach mq to use it. 2006-08-05 15:23:26 -07:00
Brendan Cully
b5f7a6230c Add '.' as a shortcut revision name for the working directory parent. 2006-08-04 14:36:03 -07:00
Vadim Gelfer
8b999d6f47 merge with self. 2006-08-04 10:38:17 -07:00
Brendan Cully
e901963dbd Add log option --follow-first to follow only the first parent of
merges.

This can be useful to extract a single line of development.
2006-08-03 11:48:56 -07:00
Brendan Cully
1a2cc77cfa Make log --follow revision range start default to working dir parent. 2006-08-03 13:29:31 -07:00
Brendan Cully
aec3a9ce5b Make log --follow without a file list follow a single head.
This includes all the parents or children (depending on the direction
of the revision range).
2006-08-03 11:06:09 -07:00
Vadim Gelfer
338d2303a1 allow None for path of hg.repository 2006-08-02 12:46:00 -07:00
Vadim Gelfer
3e92464f80 clone: replace long help string of inaky with doc comment. 2006-08-01 19:58:34 -07:00
Inaky Perez-Gonzalez
b5488dcd48 Breakup clone -r extra text help to fit in 80 columns 2006-08-01 11:12:34 -07:00
Inaky Perez-Gonzalez
3c5b91fa37 Expand clone help with hardlink information 2006-08-01 09:50:30 -07:00
Christian Ebert
68ecb33563 fix hg backup option recommendation for auto-merge 2006-08-02 03:17:06 +02:00
Vadim Gelfer
74f5dcdc3d import: make patch apply if run in subdir
fix is same as for mq patch. patch apply code should be merged.
2006-08-01 15:51:13 -07:00
Brendan Cully
5cdd0343d1 Check for parent/mod as well as parent.mod in findext.
Debian/Ubuntu ship a system-wide hgrc that loads extensions using
the syntax hgext/extension=, rather than hgext.extension=. Although
the extensions work correctly, hg help <extension> doesn't
understand this form without this patch.
2006-08-01 14:56:54 -07:00
Vadim Gelfer
6569e6bb76 import: switch from application/x-patch to text/x-diff
christian ebert says his mailer was broken.
2006-07-31 12:02:13 -07:00
Vadim Gelfer
fed53854c7 log: add -f/--follow option, to follow rename/copy 2006-07-31 07:31:31 -07:00
Vadim Gelfer
b7a96d1742 clean up hg.py: move repo constructor code into each repo module 2006-07-31 07:11:12 -07:00
Vadim Gelfer
c39398b49b merge with mpm. 2006-07-30 22:52:34 -07:00
Matt Mackall
fb73e75b58 Kill ui.setconfig_remoteopts
This brought too much knowledge about command line particulars into
the ui code. Moved to commands.py.
2006-07-31 00:47:43 -05:00
Vadim Gelfer
fc31092ae7 pull: allow to pull from bundle file without need for bundle: syntax 2006-07-30 21:46:38 -07:00
Christian Ebert
8692e17b6e fix output file format %r 2006-07-29 18:15:08 +02:00
Vadim Gelfer
0aa0ec43d9 import: allow application/x-patch for funny patch from christian ebert 2006-07-30 21:24:06 -07:00
Vadim Gelfer
96182c9dcc merge with crew. 2006-07-28 10:47:02 -07:00
Vadim Gelfer
9139c6368e hg.py: add islocal() and defaultdest() functions, refactor
islocal tells if a repo or url is local.

defaultdest returns default path for clone if explicit path not given.

clone can now take repo or url as source
2006-07-28 10:46:25 -07:00
Benoit Boissinot
4aab4129ad makes 'hg diff' diff the file in sorted order 2006-07-28 18:46:02 +02:00
Thomas Arendsen Hein
afdc004040 merge with tonfa 2006-07-28 09:01:13 +02:00
Benoit Boissinot
b66071be94 reupdate the options after loading the repo
local .hgrc could possibly override them, command line take priority
2006-07-27 19:26:01 +02:00
Benoit Boissinot
56e758020e merge gitweb with crew 2006-07-27 02:37:04 +02:00
Mathieu Clabaut ext:(%22)
f056efd753 MQ: uniformise message and logfile option.
Possibility to change message in qrefresh option
2006-07-26 20:11:54 +02:00
Vadim Gelfer
0778999161 hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
all repository classes now have url() method that returns url of repo.
2006-07-25 13:50:32 -07:00
Benoit Boissinot
e8d38e08fe self.root == '/': prefix length computation out of the loop
- put the computation out of the loop
- change the variable to a more meaningful name
2006-07-25 21:22:56 +02:00
Gil
82203eb025 Fix dirstate.walkhelper removing first char of nd when self.root == '/'. 2006-07-25 11:09:17 -07:00
Josef "Jeff" Sipek
5d12a047d0 [hgweb] Implemented shortlog (gitweb templates only) 2006-07-24 20:56:30 -04:00
Josef "Jeff" Sipek
c45ef63c97 [hgweb] Fixed up gitweb templates
Now the gitweb templates have archive links
2006-07-24 20:10:04 -04:00
Matt Mackall
987ff111ff Merge with crew 2006-07-24 11:35:04 -05:00
Vadim Gelfer
4f0a39d96b util.getuser: better comments 2006-07-24 09:22:47 -07:00
Vadim Gelfer
b5dfaa64f0 util.getuser: raise exception if win32api not available. 2006-07-24 09:19:25 -07:00
Vadim Gelfer
30704ec67b merge with crew. 2006-07-24 09:12:16 -07:00
Vadim Gelfer
07de9b45fd fix windows username problem. 2006-07-24 09:11:26 -07:00
Matt Mackall
fb4ff555cd Merge with crew 2006-07-23 14:00:29 -05:00
Frank Kingswood
b817bf8839 hgweb: Configurable zebra stripes
With this change, you can set
    [web]
    stripes=3
to get stripes every three lines (a-la fanfold paper), instead of every
line on source and directory listings. The default behaviour is stripes=1
which generates output similar to current, and you can also turn stripes
off by setting it to 0.
2006-07-24 23:06:05 -07:00
Brendan Cully
dd9b6af1b4 Make hgweb threads into daemon threads.
This fixes the problem that an interrupted hg serve will not terminate
until the next request has been received.
2006-07-20 21:58:25 -07:00
Brendan Cully
86244f1a64 Preserve multibyte UTF-8 characters when obfuscating.
This version uses the unicode 'replace' option, so non-UTF-8
encodings will still be mangled. Luckily, there aren't any
of those.
2006-07-21 02:36:17 +02:00
Benoit Boissinot
c4ef6c5403 spelling fix 2006-07-21 02:31:59 +02:00
Benoit Boissinot
f463f77610 change 'hg tag' to tag the parent rev instead of tip 2006-07-21 01:40:07 +02:00
Vadim Gelfer
1803b2474b merge with crew. 2006-07-24 14:36:32 -07:00
Vadim Gelfer
9738466350 status: add -c (clean) and -A (all files) options
also add new localrepo.status what is more uniform than localrepo.changes.
localrepo.changes is deprecated and will go away soon.
2006-07-20 16:21:07 -07:00
Matt Mackall
65a15abb1d merge with tonfa-experimental 2006-07-19 14:22:08 -05:00
Brendan Cully
3bc42b81ce Add an option '-C|--copies' to hg status to show the source of copied files.
Copied files are displayed in the form:
A newname
  oldname
2006-07-19 07:52:16 -07:00
Benoit Boissinot
8ef31fb9ac codingstyle: use spaces instead of tabs 2006-07-18 00:32:18 +02:00
Matt Mackall
a283a1d83d Merge with tonfa 2006-07-17 11:30:33 -05:00