tests/test-mq-qnew.out
author Yuya Nishihara <yuya@tcha.org>
Sun, 28 Mar 2010 15:23:11 +0900
branchstable
changeset 11513 0c944b7af564
parent 10590 5faf3566c96d
child 11575 a5903e612f07
permissions -rw-r--r--
mq: fixed ENOENT when qrename to new/directory.patch MQ patch name can contain slashes, e.g. 'foo/bar.patch'. Currently "qnew foo/bar.patch" works, but "qrename foo/bar.patch new/dir.patch" fails with "No such file or directory". Also added test case for "qnew foo/bar.patch"
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
     1
%%% plain headers
7296
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
     2
adding a
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
     3
% qnew should refuse bad patch names
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
     4
abort: "series" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
     5
abort: "status" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
     6
abort: "guards" cannot be used as the name of a patch
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
     7
abort: ".hgignore" cannot be used as the name of a patch
10588
b0b19d61d79a mq: disallow # (and : on Windows) in patch names (issue2065)
Sune Foldager <cryo@cyanite.org>
parents: 10397
diff changeset
     8
abort: ".mqfoo" cannot be used as the name of a patch
b0b19d61d79a mq: disallow # (and : on Windows) in patch names (issue2065)
Sune Foldager <cryo@cyanite.org>
parents: 10397
diff changeset
     9
abort: "foo#bar" cannot be used as the name of a patch
10589
92b8c79b34c2 mq: disallow : in patch names (issue2065)
Sune Foldager <cryo@cyanite.org>
parents: 10588
diff changeset
    10
abort: "foo:bar" cannot be used as the name of a patch
11513
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    11
% qnew with name containing slash
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    12
foo/bar.patch
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    13
popping foo/bar.patch
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    14
patch queue now empty
7296
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    15
% qnew with uncommitted changes
10372
27d542bc0f5b qnew: ignore force option
Augie Fackler <durin42@gmail.com>
parents: 10114
diff changeset
    16
uncommitted.patch
7296
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    17
% qnew implies add
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    18
A .hgignore
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    19
A series
10372
27d542bc0f5b qnew: ignore force option
Augie Fackler <durin42@gmail.com>
parents: 10114
diff changeset
    20
A uncommitted.patch
7296
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    21
% qnew missing
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    22
abort: missing: No such file or directory
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    23
% qnew -m
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    24
foo bar
7614
f9fcb189c8e2 mq: make qnew patch format consistent with qrefresh (issue1457)
Bernhard Leiner <bleiner@gmail.com>
parents: 7297
diff changeset
    25
7296
695383442347 mq: put qnew tests into own file, fold in qnew-twice
Brendan Cully <brendan@kublai.com>
parents: 2714
diff changeset
    26
% qnew twice
2711
ca97be5babf8 mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    27
abort: patch "first.patch" already exists
2714
85070b784896 Fix test-mq-qnew-twice exit code and output.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2711
diff changeset
    28
abort: patch "first.patch" already exists
7297
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    29
% qnew -f from a subdirectory
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 7627
diff changeset
    30
popping first.patch
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 7627
diff changeset
    31
popping mtest.patch
10372
27d542bc0f5b qnew: ignore force option
Augie Fackler <durin42@gmail.com>
parents: 10114
diff changeset
    32
popping uncommitted.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7614
diff changeset
    33
patch queue now empty
7297
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    34
adding d/b
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    35
M d/b
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    36
diff --git a/d/b b/d/b
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    37
--- a/d/b
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    38
+++ b/d/b
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    39
@@ -1,1 +1,2 @@
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    40
 b
bd6deb7525f4 mq: use cmdutil.matchfiles instead of match for qnew -f.
Brendan Cully <brendan@kublai.com>
parents: 7296
diff changeset
    41
+b
9733
f16ec85f125c mq: do not call ui.username unless it is necessary
Martin Geisler <mg@lazybytes.net>
parents: 9110
diff changeset
    42
% qnew -u with no username configured
f16ec85f125c mq: do not call ui.username unless it is necessary
Martin Geisler <mg@lazybytes.net>
parents: 9110
diff changeset
    43
From: blue
f16ec85f125c mq: do not call ui.username unless it is necessary
Martin Geisler <mg@lazybytes.net>
parents: 9110
diff changeset
    44
10114
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    45
% fail when trying to import a merge
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    46
adding a
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    47
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    48
created new head
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    49
merging a
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    50
warning: conflicts during merge.
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    51
merging a failed!
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    52
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    53
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
3e7663b2f3fc mq: qnew -f should reject merge working directories
timeless <timeless@mozdev.org>
parents: 9733
diff changeset
    54
abort: cannot manage merge changesets
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    55
%%% hg headers
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    56
adding a
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    57
% qnew should refuse bad patch names
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    58
abort: "series" cannot be used as the name of a patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    59
abort: "status" cannot be used as the name of a patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    60
abort: "guards" cannot be used as the name of a patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    61
abort: ".hgignore" cannot be used as the name of a patch
10588
b0b19d61d79a mq: disallow # (and : on Windows) in patch names (issue2065)
Sune Foldager <cryo@cyanite.org>
parents: 10397
diff changeset
    62
abort: ".mqfoo" cannot be used as the name of a patch
b0b19d61d79a mq: disallow # (and : on Windows) in patch names (issue2065)
Sune Foldager <cryo@cyanite.org>
parents: 10397
diff changeset
    63
abort: "foo#bar" cannot be used as the name of a patch
10590
5faf3566c96d mq: correct test output
Sune Foldager <cryo@cyanite.org>
parents: 10589
diff changeset
    64
abort: "foo:bar" cannot be used as the name of a patch
11513
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    65
% qnew with name containing slash
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    66
foo/bar.patch
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    67
popping foo/bar.patch
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 10590
diff changeset
    68
patch queue now empty
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    69
% qnew with uncommitted changes
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    70
uncommitted.patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    71
% qnew implies add
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    72
A .hgignore
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    73
A series
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    74
A uncommitted.patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    75
% qnew missing
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    76
abort: missing: No such file or directory
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    77
% qnew -m
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    78
# HG changeset patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    79
# Parent 
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    80
foo bar
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    81
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    82
% qnew twice
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    83
abort: patch "first.patch" already exists
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    84
abort: patch "first.patch" already exists
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    85
% qnew -f from a subdirectory
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    86
popping first.patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    87
popping mtest.patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    88
popping uncommitted.patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    89
patch queue now empty
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    90
adding d/b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    91
M d/b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    92
# HG changeset patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    93
# Parent 
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    94
diff --git a/d/b b/d/b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    95
--- a/d/b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    96
+++ b/d/b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    97
@@ -1,1 +1,2 @@
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    98
 b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
    99
+b
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   100
% qnew -u with no username configured
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   101
# HG changeset patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   102
# Parent 
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   103
# User blue
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   104
% fail when trying to import a merge
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   105
adding a
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   106
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   107
created new head
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   108
merging a
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   109
warning: conflicts during merge.
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   110
merging a failed!
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   111
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   112
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 10372
diff changeset
   113
abort: cannot manage merge changesets