Mercurial > hg > mercurial

annotate mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java @ 915:6b5e83970a26 Hajipur-9.0.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test: test repository requires a more recent mercurial
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 02 Jan 2015 12:36:52 +0100
parents 31a1aca3305c
children 7bf4d943d5bb
rev   line source
732
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
1 /*
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
2 * Copyright 2000-2014 JetBrains s.r.o.
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
3 *
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
4 * Licensed under the Apache License, Version 2.0 (the "License");
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
5 * you may not use this file except in compliance with the License.
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
6 * You may obtain a copy of the License at
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
7 *
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
8 * http://www.apache.org/licenses/LICENSE-2.0
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
9 *
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
10 * Unless required by applicable law or agreed to in writing, software
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
11 * distributed under the License is distributed on an "AS IS" BASIS,
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
13 * See the License for the specific language governing permissions and
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
14 * limitations under the License.
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
15 */
31a1aca3305c Update copyright
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 696
diff changeset
16
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
17 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
18
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
19 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.AuthSettings;
480
efba721f9a1d TW-23382 agent logs with info, server logs with debug
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 445
diff changeset
20 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.TestCommandSettingsFactory;
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
21 import jetbrains.buildServer.vcs.*;
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
22 import org.jetbrains.annotations.NotNull;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
23 import org.testng.annotations.BeforeMethod;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
24 import org.testng.annotations.Test;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
25
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
26 import java.io.ByteArrayOutputStream;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
27 import java.io.File;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
28 import java.io.IOException;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
29 import java.util.List;
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
30 import java.util.Map;
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
31
513
575d716a6846 Fix tests on agents with enabled largefiles extension
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 485
diff changeset
32 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport;
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
33 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.buildPatch;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
34 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
35 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
36
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
37 @Test
637
49a03af60439 Extract common test logic
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 590
diff changeset
38 public class RevisionFormatTest extends BaseMercurialPatchTestCase {
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
39
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
40 private MercurialVcsSupport myVcs;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
41 private VcsRoot myRoot;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
42 private File myRemoteRepoDir;
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
43
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
44 @BeforeMethod
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
45 public void setUp() throws Exception {
637
49a03af60439 Extract common test logic
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 590
diff changeset
46 super.setUp();
513
575d716a6846 Fix tests on agents with enabled largefiles extension
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 485
diff changeset
47 ServerPluginConfig pluginConfig = new ServerPluginConfigBuilder()
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
48 .cachesDir(myTempFiles.createTempDir())
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
49 .build();
513
575d716a6846 Fix tests on agents with enabled largefiles extension
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 485
diff changeset
50 myVcs = mercurialSupport().withConfig(pluginConfig).build();
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
51
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
52 myRemoteRepoDir = copyRepository(myTempFiles, new File("mercurial-tests/testData/rep1").getAbsolutePath());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
53 myRoot = vcsRoot().withUrl(myRemoteRepoDir.getAbsolutePath()).build();
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
54 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
55
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
56
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
57 public void collect_changes_result_does_not_depend_on_revnums() throws VcsException {
567
27cd2503cea3 Extract MercurialCollectChangesPolicy
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 513
diff changeset
58 List<ModificationData> changesWithRevnums = myVcs.getCollectChangesPolicy().collectChanges(myRoot,
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
59 "1:1d446e82d356", "3:9522278aa38d", CheckoutRules.DEFAULT);
567
27cd2503cea3 Extract MercurialCollectChangesPolicy
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 513
diff changeset
60 List<ModificationData> changesWithoutRevnums = myVcs.getCollectChangesPolicy().collectChanges(myRoot,
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
61 "1d446e82d356", "9522278aa38d", CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
62 assertEquals(changesWithoutRevnums, changesWithRevnums);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
63 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
64
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
65
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
66 public void labeling_does_not_depend_on_revnums() throws Exception {
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
67 myVcs.label("tag1", "3:9522278aa38d", myRoot, CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
68 myVcs.label("tag2", "9522278aa38d", myRoot, CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
69 HgRepo repo = createRepo(myRemoteRepoDir);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
70 String tag1 = repo.id().inLocalRepository().namedRevision("tag1").call();
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
71 String tag2 = repo.id().inLocalRepository().namedRevision("tag2").call();
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
72 assertEquals(tag2, tag1);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
73 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
74
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
75
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
76 public void get_file_content_does_not_depend_on_revnums() throws Exception {
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
77 byte[] contentWithRevnums = myVcs.getContent("dir1/file4.txt", myRoot, "2:7209b1f1d793");
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
78 byte[] contentWithoutRevnums = myVcs.getContent("dir1/file4.txt", myRoot, "7209b1f1d793");
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
79 assertEquals(contentWithoutRevnums, contentWithRevnums);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
80 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
81
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
82
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
83 public void clean_patch_does_not_depend_on_revnums() throws Exception {
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
84 setName("cleanPatch1_checkout_rules");
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
85 ByteArrayOutputStream output = buildPatch(myVcs, myRoot, null, "4:b06a290a363b", new CheckoutRules("+:dir1/subdir=>."));
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
86 checkPatchResult(output.toByteArray());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
87 output = buildPatch(myVcs, myRoot, null, "b06a290a363b", new CheckoutRules("+:dir1/subdir=>."));
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
88 checkPatchResult(output.toByteArray());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
89 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
90
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
91 public void incremental_patch_does_not_depend_on_revnums() throws Exception {
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
92 setName("patch2");
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
93 ByteArrayOutputStream output = buildPatch(myVcs, myRoot, "3:9522278aa38d", "6:b9deb9a1c6f4", CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
94 checkPatchResult(output.toByteArray());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
95 output = buildPatch(myVcs, myRoot, "9522278aa38d", "6:b9deb9a1c6f4", CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
96 checkPatchResult(output.toByteArray());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
97 output = buildPatch(myVcs, myRoot, "3:9522278aa38d", "b9deb9a1c6f4", CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
98 checkPatchResult(output.toByteArray());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
99 output = buildPatch(myVcs, myRoot, "9522278aa38d", "b9deb9a1c6f4", CheckoutRules.DEFAULT);
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
100 checkPatchResult(output.toByteArray());
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
101 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
102
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
103
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
104 public void should_not_include_revnum_in_current_version() throws VcsException {
696
a07f685ce394 Get rid of depricated getCurrentVersion() method
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 639
diff changeset
105 RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(myRoot);
a07f685ce394 Get rid of depricated getCurrentVersion() method
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 639
diff changeset
106 String currentVersion = state.getBranchRevisions().get(state.getDefaultBranchName());
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
107 assertFalse(currentVersion.contains(":"));
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
108 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
109
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
110
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
111 public void should_not_include_revnum_in_current_state() throws VcsException {
590
87754c01d304 LogUtil is not available in vcs worker + remove duplicates
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 567
diff changeset
112 RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(myRoot);
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
113 for (Map.Entry<String, String> entry : state.getBranchRevisions().entrySet()) {
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
114 String branchName = entry.getKey();
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
115 String revision = entry.getKey();
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
116 assertFalse(revision.contains(":"), "Revision of branch " + branchName + " contains revnum: " + revision);
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
117 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
118 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
119
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
120
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
121 public void should_not_include_revnum_in_collected_changes() throws VcsException {
567
27cd2503cea3 Extract MercurialCollectChangesPolicy
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 513
diff changeset
122 List<ModificationData> changes = myVcs.getCollectChangesPolicy().collectChanges(myRoot, "1d446e82d356", "9522278aa38d", CheckoutRules.DEFAULT);
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
123 for (ModificationData c : changes) {
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
124 assertFalse(c.getVersion().contains(":"), "Change version contains revnum: " + c.toString());
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
125 for (String parentVersion : c.getParentRevisions()) {
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
126 assertFalse(parentVersion.contains(":"), "Parent version contains revnum: " + c.toString());
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
127 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
128 for (VcsChange changedFile : c.getChanges()) {
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
129 assertFalse(changedFile.getAfterChangeRevisionNumber().contains(":"),
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
130 "Vcs change contains revnum : " + changedFile.toString());
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
131 assertFalse(changedFile.getBeforeChangeRevisionNumber().contains(":"),
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
132 "Vcs change contains revnum : " + changedFile.toString());
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
133 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
134 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
135 }
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
136
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
137
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
138 @Override
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
139 protected String getTestDataPath() {
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
140 return "mercurial-tests/testData";
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
141 }
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
142
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
143 private HgRepo createRepo(@NotNull File dir) throws IOException {
480
efba721f9a1d TW-23382 agent logs with info, server logs with debug
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 445
diff changeset
144 return new HgRepo(new TestCommandSettingsFactory(), dir, Util.getHgPath(), new AuthSettings());
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
145 }
445
b47cfe5cbaba Do not include revnum in revision
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 444
diff changeset
146
444
a05eca69fc01 Ensure plugin works without revnums in revisions
Dmitry Neverov <dmitry.neverov@gmail.com>
parents:
diff changeset
147 }