Commit Graph

13862 Commits

Author SHA1 Message Date
Augie Fackler
4f0fd8fe64 compact style: show bookmarks in the same manner as tags 2011-04-13 13:06:35 -05:00
Augie Fackler
52f8941398 revsets: preserve ordering with the or operator
This is valuable because now revsets like 'bookmarks() or tip' will
always show tip after bookmarks unless tip was itself a bookmark. This
is a somewhat contrived example, but this behavior is useful for
"where am I" type aliases that use log and revsets.
2011-04-13 12:30:41 -05:00
Md. O. Shayan
20e62c51a1 hgweb: set minimum number of revision to display to 1 when revcount is 0
When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).
2011-04-13 07:40:24 +05:30
Matt Mackall
24e0621116 zeroconf: clean up naked exceptions 2011-04-13 12:57:24 -05:00
Idan Kamara
22e5d8d701 localrepo: don't add deleted files to list of modified/added files (issue2761)
If a file is deleted (rm, not 'hg rm') from the working dir
an attempt to run 'hg diff -r X', with the file being present in X will
cause an abort.

We didn't check if the file has been deleted from the working dir
and later on tried to open it to compare with the one from X, causing the abort.

This fix adds that check. Consequently, no output will be returned.
2011-04-11 21:44:22 +03:00
Adrian Buehlmann
a61eaad778 path_auditor: eliminate local function 'check' in __call__ 2011-04-11 10:06:57 +02:00
Augie Fackler
7070a6da65 subrepo: trailing whitespace cleanup 2011-04-11 07:34:40 -05:00
Adrian Buehlmann
a5b6c426a2 util: move checkosfilename call from path_auditor to opener
path_auditor is used for checking patterns too, but a pattern is not a valid
filename.

This patch fixes fb1792e89e34, which introduced the bug:

  $ hg log -l3 glob:**.py
  abort: filename contains '*', which is reserved on Windows: mercurial\**.py
2011-04-10 19:31:49 +02:00
Idan Kamara
3828767e58 tests: add tests for non-existant branch/tag/bookmark 2011-04-10 11:30:53 +03:00
Yuya Nishihara
109c433261 hgweb: add bookmarks listing to summary page of gitweb/monoblue styles 2011-04-10 10:01:42 +09:00
Yuya Nishihara
fe54e1ef28 hgweb: remove useless notip handling from bookmarks listing 2011-04-10 10:01:39 +09:00
Yuya Nishihara
723e882e64 hgweb: sort bookmarks in the same manner as console command 2011-04-10 10:01:37 +09:00
Yuya Nishihara
9446b862c9 hgweb: add bookmarks listing to raw style with test case 2011-04-10 06:37:20 +09:00
Md. O. Shayan
475f1c2d09 grep: don't print data from binary files for matches (issue2614) 2011-04-09 23:13:17 +05:30
Idan Kamara
35892dd390 color: reset win32 console color in a finally block 2011-04-09 23:53:23 +03:00
Matt Mackall
a9372128fb tests: better output on timeouts
Formerly, timeouts would generate huge scrollback-destroying diffs and
weird -15 return codes in the summary. Now we simply report "timed
out".
2011-04-09 15:52:19 -05:00
John Mulligan
1ee89471ca acl: add branch tests for the current behavior of acl extension
Adds simple tests for the acl.allow.branches and acl.deny.branches
configuration options of the acl extension.
2011-02-07 16:37:03 -05:00
Adrian Buehlmann
9b801e586d path_auditor: check filenames for basic platform validity (issue2755)
Example (on Windows):

  $ hg parents
  $ hg manifest tip
  con.xml
  $ hg update
  abort: filename contains 'con', which is reserved on Windows: con.xml

Before this patch, update produced (as explained in issue2755):

  $ hg update
  abort: No usable temporary filename found

I've added the new function checkwinfilename to util.py and not to windows.py,
so that we can later call it when running on posix platforms too, for when we
decide to implement a (configurable) warning message on 'hg add'.

As per this patch, checkwinfilename is currently only used when running
on Windwows.

path_auditor calls checkosfilename, which is a NOP on posix and an alias for
checkwinfilename on Windows.
2011-04-06 18:09:43 +02:00
Idan Kamara
05b035daf6 revset: rearrange code so functions are sorted alphabetically 2011-04-08 17:47:58 +03:00
Idan Kamara
32b6eeef14 revset: abort when tag or bookmark doesn't exist 2011-04-07 19:24:16 +03:00
Matt Mackall
917a94fe21 merge with stable 2011-04-07 15:08:15 -05:00
Idan Kamara
17914fe278 bookmarks: change error messages to match those given by 'hg tag' commands 2011-04-07 17:57:38 +03:00
Matt Mackall
ddc767098f audit: improve nested repo message 2011-04-07 14:43:19 -05:00
Idan Kamara
9fe3148843 tags: remove another check for valid nodes
see 3a1c93dc25b9
2011-04-07 17:16:17 +03:00
Idan Kamara
35ad577c17 revset: replace for-loop with list comprehension 2011-04-07 16:20:40 +03:00
Matt Mackall
f80e0eddc7 subrepo: fix up svn test output 2011-04-07 09:47:30 -05:00
Thomas Arendsen Hein
e97f821988 subrepo: prevent url normalization from removing // in ssh paths (issue2556) 2011-04-07 12:33:47 +02:00
Martin Geisler
be192b7fa4 merge with stable 2011-04-07 11:40:54 +02:00
Md. O. Shayan
43492ff710 hgweb: fix inconsistant display of graphlog (issue1706) 2011-04-07 13:23:07 +05:30
Martin Geisler
bcd0e81ccd hgrc.5: drop 'hgext.' prefix when talking about extensions
The first paragraph apply to all extensions, not just those in hgext.
The second paragraph can just use the simpler form to load mq.
2011-04-07 11:17:55 +02:00
Matt Mackall
2f6eb4eb14 merge with crew 2011-04-06 15:15:06 -05:00
Matt Mackall
f6a25a1901 merge with stable 2011-04-06 15:14:51 -05:00
Matt Mackall
ada95b57d4 merge with crew 2011-04-06 15:13:49 -05:00
Matt Mackall
bfe6a35a69 url: use a regex to hide unsupported ssh passwords (issue2754) 2011-04-06 15:10:47 -05:00
Martin Geisler
43d795e497 commit: note when files are missing
Before, you could experience the following strange interaction:

  $ hg commit
  nothing changed
  $ hg merge
  abort: outstanding uncommitted changes

which confused at least one user in #mercurial.
2011-04-06 16:21:12 +02:00
Martin Geisler
3c1a708683 relink: correct unusual indentation 2011-04-06 15:26:49 +02:00
Thomas Arendsen Hein
1b0518593c hg: make parseurl() consistently return normalised path
Before this the path was only normalised when a fragment was used.
2011-04-06 12:48:59 +02:00
Jim Hague
80a125d068 bugzilla: more documentation formatting fixups
Correct typo in numbering list of access methods.
Convert a section reference and a template parameter reference into
literal text, for consistency with other use.
2011-04-06 11:30:08 +01:00
Matt Mackall
8d3fa534fc merge with stable 2011-04-05 16:11:40 -05:00
Martin Geisler
f484933f96 help/dates: rephrase explanation of internal format
The old explanation referred to the two numbers as "unixtime" and
"offset" without really defining those terms.
2011-04-05 10:04:19 +02:00
Idan Kamara
bcbd1c4dc5 tags: no need to check for valid nodes
_findtags in localrepo checks that nodes exist in the revlog so we
can't get a LookupError here.

The output of 'hg tags' stays the same since tags to unknown nodes
didn't get printed before anyway due to 734bab2916a6.
2011-04-04 23:43:22 +03:00
Idan Kamara
c341aeb03e localrepo: ignore tags to unknown nodes (issue2750) 2011-04-04 22:51:10 +03:00
Arne Babenhauserheide
8fe2ac6071 merge: added info that hg help merge-tools shows the options for --tool 2011-04-05 19:48:44 +02:00
Adrian Buehlmann
34d2bab4e0 util: move checklink() to posix.py and return False on Windows
Python added support for Windows 6.0 (Vista) symbolic links in 3.2 [1], but
even these symbolic links aren't what we can expect from a canonical
symbolic link, since creation requires SeCreateSymbolicLinkPrivilege,
which typically only admins have.

So we can safely assume that we don't have symbolic links on Windows.

[1] http://docs.python.org/py3k/library/os.html#os.symlink
2011-04-05 11:55:52 +02:00
Yun Lee
234710b7b8 util: make 'hg log -d --2' abort (issue2734) 2011-04-05 16:55:47 +08:00
Yun Lee
fd8965dcbb help: sort help topics to make the output more readable (issue2751) 2011-04-05 12:40:47 +08:00
Martin Geisler
77c3683101 merge with stable 2011-04-05 11:09:08 +02:00
Martin Geisler
a5339415db help/dates: use DATE as place-holder in help and abort texts
The use of "{datetime}" was unfortunate since I as a user never knew
if I was expected to do

  hg log -d '>{2011-04-01}'

or

  hg log -d '>2011-04-01'

The word "datetime" is also confusing -- calling it a date it much
simpler.
2011-04-05 10:01:39 +02:00
Martin Geisler
722384a5f7 keyword: convert a verbatim block to a field list 2011-04-05 11:07:25 +02:00
Martin Geisler
9dfcd73e5b bugzilla: convert a verbatim block to a field list 2011-04-05 10:22:58 +02:00