Joel Rosdahl
bd755ed723
convert: Remove unused clone method
2008-03-06 22:23:41 +01:00
Joel Rosdahl
2cc739b2aa
convert: Fix unbound name error in the subversion backend
2008-03-06 22:23:41 +01:00
Joel Rosdahl
9c3f9d4bd6
imerge: Fix unbound name error and add a test case
2008-03-06 22:23:41 +01: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
Thomas Arendsen Hein
deb94bc7fe
Removed trailing spaces from everything except test output
2008-03-07 00:24:36 +01:00
Thomas Arendsen Hein
9ff01ae3fe
Replaced tab in run-tests.py
2008-03-07 00:01:13 +01:00
Peter Arrenbrecht
85ef77aca1
tests: add --keep-tmp to run-tests.py to debug test environment
...
When set, you can find the working dir of the test run as a
uniquely named subdirectory of --tmpdir so you can inspect
it.
2008-03-05 08:00:05 +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
Peter Arrenbrecht
b99cdae6e3
mq: test for qclone of http repo+queue
...
tests 4fa9f56bd8a3 and 4afb45fca538
2008-03-03 21:48:43 +01:00
Jesse Glick
5a5b96808a
When failing to load an extension, show where Hg tried to load it from.
2008-03-03 12:46:57 -05:00
Thomas Arendsen Hein
cc608e0715
hgweb/annotate: handle binary files like hgweb/file
2008-03-02 23:32:13 +01:00
Thomas Arendsen Hein
d291778049
test-status: Make assert function definition sh compatible.
2008-03-02 20:54:00 +01:00
Thomas Arendsen Hein
d659d68d7a
Extend/correct f488b5acd598 regarding -qA and ignored files.
...
hg status -qA will now hide untracked files as described in the doc string.
2008-03-02 13:52:34 +01:00
Zoran Bosnjak
ddaa8e2b8b
'hg status -q' output skips non-tracked files.
...
The '-q' flag was ignored in status command. But this flag
can be used to hide non-tracked files in hg status output.
This small correction makes status command more general,
similar to 'svn status', where '-q' flag has the same effect.
The '-u' and '-A' flags have priority over '-q'.
A testcase and doc-string for status was extended to cover
'-q' flag.
2008-03-01 22:30:03 +01:00
Brendan Cully
4ef0063f6e
highlight: forgot import
2008-02-29 14:48:21 -08:00
Brendan Cully
1ba6154655
highlight: guess by text when path name is ambiguous
...
Although the docs claim that guess_lexer_for_filename will fall back
to using file data, my ubuntu 7.10 pygments library seems to ignore
the text argument. So call guess_lexer explicitly on failure.
2008-02-29 14:47:07 -08:00
Brendan Cully
8d21038955
highlight: make div trimmer work when lexer fails to identify text.
...
In this case, there is no initial <span> tag.
2008-02-29 14:21:15 -08:00
Brendan Cully
bb081ab6da
highlight: use iter() instead of generator comprehension
2008-02-29 11:13:50 -08:00
Dirkjan Ochtman
104e743dab
mq: remove unimplemented option -f for strip
2008-02-29 09:54:28 +01:00
Brendan Cully
7978fadb5b
highlight: bail out if file is binary
2008-02-28 22:04:22 -08:00
Brendan Cully
c74bac600d
highlight: support annotate, and reduce layering violations.
2008-02-28 21:35:27 -08:00
Thomas Arendsen Hein
9f92f48ca6
Introduce templateopts and logopts to reduce duplicate option definitions.
2008-02-29 02:45:12 +01:00
Thomas Arendsen Hein
5ef42250f9
Add option -l/--limit to hg incoming and hg outgoing.
2008-02-29 02:15:31 +01:00
Thomas Arendsen Hein
5727413b6a
Move finding/checking the log limit to cmdutil
2008-02-29 01:51:23 +01:00
Thomas Arendsen Hein
824190bf69
Make hg debugancestor accept -R by making it an optionalrepo command.
2008-02-29 01:25:31 +01:00
Thomas Arendsen Hein
4ccb125e93
debugancestor: use *args instead of *opts, to not confuse with option dicts.
2008-02-29 01:14:37 +01:00
Marti Raudsepp
e8713cc272
mq: Cleanup: update outdated file header.
2008-02-28 17:37:56 +02:00
Marti Raudsepp
ceefe77d88
convert: Clean up authormap key=value splitting.
...
Introduces a subtle parsing difference: dstauthor can now contain '='
characters.
2008-02-28 17:37:56 +02:00
Marti Raudsepp
40ade60f8b
convert: Avoid redundant newline on authormap errors.
...
The extra rstrip is necessary in case the file has uses different line
terminators (i.e. CRLF).
2008-02-28 17:37:56 +02:00
Marti Raudsepp
c1c082f372
convert: Ignore empty lines in authormap file.
2008-02-28 17:37:56 +02:00
Thomas Arendsen Hein
da3b50be51
Add config option to disable putting .hg_archival.txt inside archives.
2008-02-28 22:39:59 +01:00
Dirkjan Ochtman
031a486c8a
add a blame alias for annotate
...
The original cvs command was called blame. SVN has both, and other VC systems
typically also have this as an alias. Makes things easier for converts.
2008-02-28 19:08:04 +01:00
Dirkjan Ochtman
90d248f9a6
warning on push should mention heads, not branches
...
This makes the concept easier to relate to similar messages given on pull,
and allows for a distinction between heads and (named) branches.
2008-02-28 17:51:04 +01:00
Patrick Mezard
6beba5b5d7
commands: lock() the repo while unbundling (issue1004)
2008-02-28 00:07:38 +01:00
Patrick Mezard
d5040b6003
patch: fix iterhunks() with trailing binary file removal
...
Like some renames or copy operations, binary file removal does not generate any
"file" or "hunk" action, but was not tagged as such and let iterhunk() assume
no hunk was applied for the deleted file.
2008-02-28 00:07:37 +01:00
Bryan O'Sullivan
d0cd27dcac
debugancestor: make the index argument optional, defaulting to 00changelog.i
2008-02-27 14:58:44 -08:00
Thomas Arendsen Hein
f4fe19c813
Renamed "manifest" to "files" in web templates.
...
manifest.tmpl is still used, so people having their own templates don't have
to change them. "cmd=manifest" still works, new style URLs are not affected,
because they already used "/file/".
2008-02-26 22:42:37 +01:00
Thomas Arendsen Hein
1f75a1eb43
Removed old-style hgweb templates
2008-02-26 22:21:34 +01:00
Steve Borho
6ccb1552b6
add explicit extension disabling syntax to hgrc.5
2008-02-26 06:25:11 -06:00
Jesse Glick
cf2fd9f31a
Permit XML entities to be escaped in template output.
...
Useful for creating XML documents directly from Hg logging. Can also be used for
HTML. For use in content, will escape '&', '<', and for completeness '>'
(although it is not strictly necessary). For use in attributes, will also escape
' and ". Will also replace nonprinting (ASCII) control characters with spaces,
since these are illegal in XML.
2008-01-28 22:19:12 -05:00
Patrick Mezard
1bee8eb741
convert: add shallow, single branch svn conversions via svn.startrev
2008-02-24 17:58:55 +01:00
Patrick Mezard
e6c6545487
convert: allow svn trunk/branches/tags detection to be skipped
...
- eluding convert.svn.branches defaults to "branches"
- convert.svn.branches= disables branches detection
- convert.svn.branches=/ is equivalent to former convert.svn.branches=
2008-02-24 17:58:53 +01:00
John Mulligan
868fd6b157
Add --all option to bundle command
2008-02-21 08:24:58 -05:00
Patrick Mezard
7a9633ffc5
Fix test-convert.out after 7258ee216b30
2008-02-23 19:37:44 +01:00
Patrick Mezard
613f127c0d
convert: improve subversion source documentation
2008-02-23 16:43:33 +01:00
Dirkjan Ochtman
b1672f1ac2
hgweb: fix parameter mixup (issue1001)
2008-02-23 11:19:59 +01:00
Dirkjan Ochtman
6297ff3f5b
tests: easier hg serve error diagnosis
2008-02-23 11:18:34 +01:00
Peter Arrenbrecht
7f8994bad6
util: make walkrepos() return .hg/patches if present
2008-02-21 20:56:06 +01:00
