upstream/mercurial-mirror Commit - r547:4fc63e22

TODO

0 +2 -4

             - directory foo.d or foo.i with existing file foo (use some quoting?)
             - get various options from hgrc (e.g. history always -v, tip always -q)
             - better push support (hack exists)
-            - hg over ssh:// and https://
+            - hg over ssh:// and https:// and rsync://
-            - commit mailinglist/trigger/hooks
+            - hooks for new changesets getting pulled/imported etc.
             - make showing removed files (in history etc.) faster.
             Commands:
             - select to pull a subset of the heads
             - commands.py: number of args too much magic (e.g. in patch())
             - automatic pull fallback to old-http://
-            - hg pull http://example.com doesn't say that no repo was found
-            - hg annotate -u and hgweb annotate with long $EMAIL
             - hg pull default in a subdir doesn't work, if it is a relative path
             - optionally only show merges (two parents or parent != changeset-1, etc.)

hgeditor

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             #
             # This is an example of using HGEDITOR to automate the signing of
             # commits and so on.

hgmerge

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             #
             # hgmerge - default merge helper for Mercurial
             #

mercurial/commands.py

0 +4 -2

                     if ui.verbose:
                         ui.status("description:\n")
                         ui.status(description)
-                        ui.status("\n")
+                        ui.status("\n\n")
                     else:
                         ui.status("summary:     %s\n" % description.splitlines()[0])
                 ui.status("\n")
                 d = dircleanup(dest)
                 link = 0
-                if not source.startswith("http://"):
+                if not (source.startswith("http://") or
+                        source.startswith("hg://") or
+                        source.startswith("old-http://")):
                     d1 = os.stat(dest).st_dev
                     d2 = os.stat(source).st_dev
                     if d1 == d2: link = 1

tests/fish-merge

0 +2 0

+            #!/bin/sh
             set -e
             set -x

tests/run-tests

0 +3 -5

-            #!/bin/bash
+            #!/bin/sh -e
-            set -e
             export LANG=C
             export LC_CTYPE="C"
                 rm -f $1.err
                 export TZ=GMT
                 D=`mktemp -d`
-                if [ "$D" == "" ] ; then
+                if [ "$D" = "" ] ; then
             	echo mktemp failed!
                 fi
             }
             TESTS=$@
-            if [ "$TESTS" == "" ] ; then
+            if [ "$TESTS" = "" ] ; then
                 TESTS=`ls test-* | grep -Ev "\.|~"`
             fi

tests/test-bad-pull

0 +2 -1

-            #!/bin/bash -x
+            #!/bin/sh -x
             hg clone http://localhost:20059/ copy
             echo $?
             EOF
             python dumb.py 2>/dev/null &
+            sleep 2
             hg clone http://localhost:20059/foo copy2
             echo $?

tests/test-bad-pull.out

0 +1 0

             ls: copy: No such file or directory
             + cat
             + python dumb.py
+            + sleep 2
             + hg clone http://localhost:20059/foo copy2
             requesting all changes
             adding changesets

tests/test-basic

0 +2 -2

-            #!/bin/bash
+            #!/bin/sh
             set -x
             mkdir t
             hg history
             hg manifest
             hg cat a
-            hg verify
  No newline at end of file
+            hg verify

tests/test-conflict

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             set -x
             hg init

tests/test-copy

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             set -x
             hg init

tests/test-help

0 +1 -1

tests/test-pull

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             mkdir test
             cd test

tests/test-rawcommit1.out

0 +6 0

             description:
             + rm b
             + hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
             + hg -d manifest 3
             description:
             + echo this is a22
             + hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
             + hg -d manifest 4
             description:
             + echo this is c22
             + hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
             + hg -d manifest 5
             description:
             + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
             + hg -d manifest 6
             d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
             description:
             + hg -d rawcommit -p 6 -d '0 0' -u user -t7
             + hg -d manifest 7
             d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
             description:

tests/test-simple-update

0 +1 -1

tests/test-tags

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             set -x
             mkdir t

tests/test-undo

0 +1 -1

-            #!/bin/bash
+            #!/bin/sh
             set -x
             mkdir t

tests/test-up-local-change

0 +1 -1

tests/test-up-local-change.out

0 +2 0

             description:
             changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
             manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
             user:        test
             description:
             + hg diff
             + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
             diff -r 1e71731e6fbb a

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages