Commit Graph

6188 Commits

Author SHA1 Message Date
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
Thomas Arendsen Hein
94ab532ffb Allow "file://localhost/" in addition to "file:///" (issue728)
file://localhost/ URLs are generated by Mac OS X API calls like
[NSURL fileURLWithPath:].

Imported patch from Paul Bx.
2008-02-22 21:58:15 +01:00
Peter Arrenbrecht
7d5130edff mq: make qclone ask remote source repo for qbase using lookup protocol 2008-02-21 23:00:50 +01: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
9db0aea4ab Add test case for backout on named branches (issue665) 2008-02-22 11:28:14 +01:00
Gilles Moris
09841be9f6 Reverse the way backout is doing the merge
Currently, backout is creating a backout revision as a child node of the
backed out node and will leave you at this new head. This has several
drawbacks:
* this changes the current head
* when there is a long history between the backed out node and the
current head, this will generate a huge number of diffs that are scary
at first sight, and not very natural to review before commit.
The change consists to switch back to the original node as soon as the
backout node (which becomes the new tip) has been created. Then the
--merge option can just merge this new tip in the current node.
* the current head/node is not changed from the user's point of view
* even without using the --merge option, the backout revision is still
easy to locate, as this is the tip
* the merge is much more intuitive as diffs of the merge is right you
are looking to backout
2008-02-21 08:52:52 +01:00
Alexis S. L. Carvalho
5cae264d5a tests: hide the name of the branch cache file 2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
a34bc213b5 test-mq-pull-from-bundle: don't print the contents of $HGRCPATH 2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
e8fbf94f2c repo.status: also compare flags for files in the lookup list.
We might be able to do something smarter about this in dirstate.status
for files in normallookup state, but that would require some extra
care to keep backwards compatibility.
2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
c028f52c83 keyword: remove "identify" and "remove" from nokwcommands
These two commands care about the list of modified files returned
by repo.status and we may need to do a full content comparison to
populate that list.
2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
ab8ab21710 test-glog: pass the list of files to commit
test-glog uses debugsetparents instead of update+merge to create
some funky DAGs, and so the dirstate contents won't be consistent
with the checked out revision.

Passing an explicit list of files to commit reduces a bit the
dependency on the dirstate.

Using a non-deprecated rawcommit might be better here.
2008-02-21 16:22:31 -03:00
Dirkjan Ochtman
9710ce5ef6 hgweb: no i18n in protocol responses 2008-02-21 15:56:35 +01:00
Dirkjan Ochtman
44000fbf43 improve changegroup.readbundle(), use it in hgweb 2008-02-21 17:02:28 +01:00