Commit Graph

1468 Commits

Author SHA1 Message Date
Matt Mackall
2f71d8bc35 Add missing test output 2005-10-27 13:48:00 -07:00
Benoit Boissinot
e25f65575b make readconfig take a filename instead of a file pointer as argument
catch parse error while reading a config file
add a testcase for parse error
2005-10-27 13:40:56 -07:00
Benoit Boissinot
c0646b0eff make revert use standard matcher 2005-10-27 13:31:12 -07:00
Benoit Boissinot
1a6aabcbb0 rewrote changes function in dirstate to use generic walk code
now, file with unsupported type will not show up in status anymore
2005-10-27 13:29:35 -07:00
TK Soh
87c7c8561b minor fix on command help docstrings 2005-10-27 13:29:28 -07:00
Matt Mackall
577f208d42 Merge bundle -r work from Eric Hopper 2005-10-27 12:26:16 -07:00
Matt Mackall
5b35150f96 Remove copy/rename --parents option
This is no longer needed now that we have more standard UNIX-like copy
semantics.
2005-10-26 16:32:50 -07:00
Robin Farine
980d7b6a6d [PATCH] copy/rename a directory
This patch adds support for 'hg copy dir1 dir2' or 'hg rename dir1 dir2'.
When "dir2" exists, "dir1" is recursively copied (or moved) to "dir2/dir1".
When "dir2" does not exists, "dir1" is copied to (renamed as) "dir2".
2005-10-26 16:24:10 -07:00
Benoit Boissinot
93854a176d further fix traceback on invalid .hgignore patterns
Please apply this little fix (matchfn return None if no patterns are
specified).
2005-10-26 16:10:56 -07:00
TK Soh
ca6b7a6e20 get command defaults from hgrc 2005-10-26 16:10:36 -07:00
Matt Mackall
e2ec207d22 Remove now unused sortdiff and diff from mdiff 2005-10-25 22:17:31 -07:00
Matt Mackall
8e930ce764 Remove old manifest diff code, it's now buggy 2005-10-25 22:15:44 -07:00
Matt Mackall
5c410d334d Add Benoit to CONTRIBUTORS 2005-10-25 16:31:38 -07:00
Matt Mackall
4da8c5ab00 Add test-confused-revert, fix permissions on test-revert 2005-10-25 15:54:44 -07:00
Matt Mackall
d1e3104bf9 Allow reverting a deleted file with two parents
As elsewhere, we choose the first parent by default
2005-10-25 15:52:27 -07:00
Benoit Boissinot
27f31c20c2 revert added and removed files to their normal state before reverting
add a test for revert
2005-10-25 15:51:28 -07:00
Benoit Boissinot
0e649f370c abort on invalid pattern in matcher 2005-10-25 14:58:11 -07:00
TK Soh
b81e3092eb hgweb: add strip and rstrip filters to handle summary 2005-10-25 14:57:14 -07:00
Benoit Boissinot
2530f1f1bc fix for cloning empty repo (.hg is still empty) 2005-10-25 14:55:39 -07:00
Matt Mackall
482fb0c50c Remove deprecated commit -t option 2005-10-24 20:42:20 -07:00
Steve Borho
fd7a8ead5d zsh completion: Added '--newest-first' to incoming, outgoing 2005-10-24 19:55:44 -07:00
TK Soh
3d707867b0 hgweb: a couple of fixes on search page
- show search string in the bottom search box
- wrap search boxes within paragraphs, this also puts
  some space between last changeset and bottom
  search box in firefox.
2005-10-24 17:54:06 -07:00
tonfa@arakou.lan
c039642ffc Fix relative pull in a subdir 2005-10-24 17:41:45 -07:00
Michal Kvasnica
57636efce0 allow 'hg out' / 'hg in' to show newest commit first 2005-10-24 16:59:31 -07:00
Steve Borho
8cdd4c7b5c zsh completions: new -M, -m arguments for log, etc. 2005-10-24 16:54:07 -07:00
Benoit Boissinot
b5603de549 import docstring from doc/hg.1.txt 2005-10-24 15:52:28 -07:00
Benoit Boissinot
e70c1f7a72 add --only-merges (-m) log 2005-10-24 15:37:45 -07:00
Benoit Boissinot
6234d48191 add --no-merges (-M) for log, outgoing, incoming 2005-10-24 15:37:20 -07:00
levon@movementarian.org
048c5d5a70 Fix use of diff(1) triggered by set -e.
Search harder for a decent diff/patch to use.
2005-10-24 14:55:53 -07:00
TK Soh
073d6ec307 hgweb: fix broken filelog->changelog link 2005-10-24 14:55:46 -07:00
TK Soh
be1258aa3a hgweb: fix broken search->changelog link 2005-10-24 14:55:34 -07:00
Matt Mackall
d2fe3070de Calling flush is unnecessary with bz2 decompressors and may not even exist. 2005-10-24 14:55:20 -07:00
TK Soh
badf259cef hgk: add horizontal scrollbar to patch window 2005-10-24 14:54:54 -07:00
Eric Bloodworth
4fdfb5c5a8 Add control-w key binding to quit hgk. 2005-10-24 14:54:48 -07:00
Eric Bloodworth
7242221f63 Change asciidoc backend to more recent name.
The latest asciidoc doesn't have an 'html' backend. 'html' was last valid
with version 6 ( 2005-1-28).  Current options are  xhtml11, or
html4, with xhtml11 by default.
2005-10-24 14:54:34 -07:00
michael.w.dales@intel.com
287b19a2a6 Fixed problem with invoking hgmerge on paths with spaces. 2005-10-24 14:54:17 -07:00
Benoit Boissinot
c0239b9f56 add a target for running only one test 2005-10-24 14:53:36 -07:00
TK Soh
3b9b77f616 hgweb: improve look-n-feel of changelog nagivation 2005-10-24 14:53:25 -07:00
Benoit Boissinot
1d75d9b807 [issue21] cannot debug extension
The following patch should work.
2005-10-24 14:53:12 -07:00
levon@movementarian.org
0b2a614b26 Use $(MAKE) not make 2005-10-24 14:52:49 -07:00
Volker Kleinfeld
d90591c00e py2exe is not able to handle win32com.shell
Changes:
- setup.py: help py2exe finding the shell module in win32com.shell
2005-10-24 14:52:41 -07:00
Volker Kleinfeld
9f6716ae98 Option -i broken in py2exe_for_demandload
Using the includes option -i on modified py2exe is
not working.

Change:
- setup.py: convert self.includes to a list.
2005-10-24 14:52:30 -07:00
olivier.maquelin@intel.com
fa3a9847db Avoid insertion/deletion of CRs on stdio during hg serve 2005-10-24 14:34:48 -07:00
Matt Mackall
d6ea54aec8 hgweb: fix broken tags->changelog link 2005-10-21 00:15:55 -07:00
Benoit Boissinot
0b91d8731a Make hgweb work when the repository is empty (no 00changelog.i) 2005-10-20 11:41:14 -07:00
Matt Mackall
f36b3ac27d hgweb: add a mercurial link to the footer 2005-10-20 00:26:24 -07:00
Benoit Boissinot
4066fd89f5 hgweb: hide trivial parent (like in show_changeset) 2005-10-19 20:54:46 -07:00
Benoit Boissinot
abe08fd52f refactor some unlink/remove code and make sure we prune empty dir 2005-10-19 00:10:52 -07:00
Steve Borho
071b8206bf New vim script; provides key mappings and menus for GVIM 2005-10-19 00:05:08 -07:00
Benoit Boissinot
6c6a4b138f Do not use 'glob' expansion by default on OS != 'nt' 2005-10-19 00:02:41 -07:00