author | wenzelm |
Thu, 18 May 2017 14:14:20 +0200 | |
changeset 65865 | 177b90f33f40 |
parent 65833 | 95fd3b9888e6 |
child 66104 | 5aab14a64a03 |
permissions | -rw-r--r-- |
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
1 |
/* Title: Pure/General/mercurial.scala |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
2 |
Author: Makarius |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
3 |
|
64280 | 4 |
Support for Mercurial repositories, with local or remote repository clone |
5 |
and working directory (via ssh connection). |
|
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
6 |
*/ |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
7 |
|
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
8 |
package isabelle |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
9 |
|
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
10 |
|
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
11 |
import java.io.{File => JFile} |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
12 |
|
65832
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
13 |
import scala.annotation.tailrec |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
14 |
import scala.collection.mutable |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
15 |
|
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
16 |
|
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
17 |
object Mercurial |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
18 |
{ |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
19 |
/* command-line syntax */ |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
20 |
|
63999 | 21 |
def optional(s: String, prefix: String = ""): String = |
64304 | 22 |
if (s == "") "" else " " + prefix + " " + Bash.string(s) |
63999 | 23 |
|
24 |
def opt_flag(flag: String, b: Boolean): String = if (b) " " + flag else "" |
|
25 |
def opt_rev(s: String): String = optional(s, "--rev") |
|
26 |
def opt_template(s: String): String = optional(s, "--template") |
|
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
27 |
|
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
28 |
|
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
29 |
/* repository access */ |
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
30 |
|
64330 | 31 |
def is_repository(root: Path, ssh: Option[SSH.Session] = None): Boolean = |
32 |
new Repository(root, ssh).command("root").ok |
|
33 |
||
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
34 |
def repository(root: Path, ssh: Option[SSH.Session] = None): Repository = |
64168 | 35 |
{ |
36 |
val hg = new Repository(root, ssh) |
|
37 |
hg.command("root").check |
|
38 |
hg |
|
39 |
} |
|
40 |
||
65559 | 41 |
def find_repository(start: Path, ssh: Option[SSH.Session] = None): Option[Repository] = |
42 |
{ |
|
43 |
def find(root: Path): Option[Repository] = |
|
44 |
if (is_repository(root, ssh)) Some(repository(root, ssh = ssh)) |
|
45 |
else if (root.is_root) None |
|
46 |
else find(root + Path.parent) |
|
47 |
||
48 |
ssh match { |
|
49 |
case None => find(start.expand) |
|
50 |
case Some(ssh) => find(ssh.expand_path(start)) |
|
51 |
} |
|
52 |
} |
|
53 |
||
64168 | 54 |
def clone_repository( |
64230 | 55 |
source: String, root: Path, options: String = "", ssh: Option[SSH.Session] = None): Repository = |
64168 | 56 |
{ |
64230 | 57 |
val hg = new Repository(root, ssh) |
64255 | 58 |
ssh match { |
59 |
case None => Isabelle_System.mkdirs(hg.root.dir) |
|
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64255
diff
changeset
|
60 |
case Some(ssh) => ssh.mkdirs(hg.root.dir) |
64255 | 61 |
} |
64304 | 62 |
hg.command("clone", Bash.string(source) + " " + File.bash_path(hg.root), options).check |
64168 | 63 |
hg |
64 |
} |
|
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
65 |
|
64230 | 66 |
def setup_repository(source: String, root: Path, ssh: Option[SSH.Session] = None): Repository = |
64252
e84cba30d7ff
clarified setup_repository: more uniform pull vs. clone, without update;
wenzelm
parents:
64233
diff
changeset
|
67 |
{ |
e84cba30d7ff
clarified setup_repository: more uniform pull vs. clone, without update;
wenzelm
parents:
64233
diff
changeset
|
68 |
val present = |
e84cba30d7ff
clarified setup_repository: more uniform pull vs. clone, without update;
wenzelm
parents:
64233
diff
changeset
|
69 |
ssh match { |
e84cba30d7ff
clarified setup_repository: more uniform pull vs. clone, without update;
wenzelm
parents:
64233
diff
changeset
|
70 |
case None => root.is_dir |
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64255
diff
changeset
|
71 |
case Some(ssh) => ssh.is_dir(root) |
64252
e84cba30d7ff
clarified setup_repository: more uniform pull vs. clone, without update;
wenzelm
parents:
64233
diff
changeset
|
72 |
} |
64451
cdbfa9f64110
clarified setup_repository: even more uniform pull vs. clone (see also e84cba30d7ff);
wenzelm
parents:
64408
diff
changeset
|
73 |
if (present) { val hg = repository(root, ssh = ssh); hg.pull(remote = source); hg } |
65818
94cad7590015
avoid hardlinks, for more robustness on Windows file-systems;
wenzelm
parents:
65559
diff
changeset
|
74 |
else clone_repository(source, root, options = "--pull --noupdate", ssh = ssh) |
64252
e84cba30d7ff
clarified setup_repository: more uniform pull vs. clone, without update;
wenzelm
parents:
64233
diff
changeset
|
75 |
} |
64230 | 76 |
|
77 |
class Repository private[Mercurial](root_path: Path, ssh: Option[SSH.Session]) |
|
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
78 |
{ |
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
79 |
hg => |
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
80 |
|
64230 | 81 |
val root = |
82 |
ssh match { |
|
83 |
case None => root_path.expand |
|
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64255
diff
changeset
|
84 |
case Some(ssh) => root_path.expand_env(ssh.settings) |
64230 | 85 |
} |
86 |
||
64347 | 87 |
def root_url: String = |
88 |
ssh match { |
|
89 |
case None => root.implode |
|
90 |
case Some(ssh) => ssh.hg_url + root.implode |
|
91 |
} |
|
92 |
||
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
93 |
override def toString: String = |
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
94 |
ssh match { |
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
95 |
case None => root.implode |
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64255
diff
changeset
|
96 |
case Some(ssh) => ssh.toString + ":" + root.implode |
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
97 |
} |
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
98 |
|
64168 | 99 |
def command(name: String, args: String = "", options: String = ""): Process_Result = |
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
100 |
{ |
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
101 |
val cmdline = |
65825
11f87ab51ddb
more robust command invocation, without defaults from hgrc;
wenzelm
parents:
65822
diff
changeset
|
102 |
"\"${HG:-hg}\" --config " + Bash.string("defaults." + name + "=") + |
64230 | 103 |
(if (name == "clone") "" else " --repository " + File.bash_path(root)) + |
64168 | 104 |
" --noninteractive " + name + " " + options + " " + args |
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
105 |
ssh match { |
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
106 |
case None => Isabelle_System.bash(cmdline) |
64256
c3197aeae90b
simplified SSH.Session: sftp channel is always open and its operations provided by the main interface;
wenzelm
parents:
64255
diff
changeset
|
107 |
case Some(ssh) => ssh.execute(cmdline) |
64167
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
108 |
} |
097d122222f6
support remote repositories via ssh command execution;
wenzelm
parents:
64162
diff
changeset
|
109 |
} |
63999 | 110 |
|
64505 | 111 |
def archive(target: String, rev: String = "", options: String = ""): Unit = |
112 |
hg.command("archive", opt_rev(rev) + " " + Bash.string(target), options).check |
|
113 |
||
63999 | 114 |
def heads(template: String = "{node|short}\n", options: String = ""): List[String] = |
64168 | 115 |
hg.command("heads", opt_template(template), options).check.out_lines |
63999 | 116 |
|
64232
367d83d6030e
clarified hg.id operation, with explicit tip as default;
wenzelm
parents:
64230
diff
changeset
|
117 |
def identify(rev: String = "tip", options: String = ""): String = |
64168 | 118 |
hg.command("id", opt_rev(rev), options).check.out_lines.headOption getOrElse "" |
63998 | 119 |
|
64232
367d83d6030e
clarified hg.id operation, with explicit tip as default;
wenzelm
parents:
64230
diff
changeset
|
120 |
def id(rev: String = "tip"): String = identify(rev, options = "-i") |
367d83d6030e
clarified hg.id operation, with explicit tip as default;
wenzelm
parents:
64230
diff
changeset
|
121 |
|
63998 | 122 |
def manifest(rev: String = "", options: String = ""): List[String] = |
64168 | 123 |
hg.command("manifest", opt_rev(rev), options).check.out_lines |
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
124 |
|
64033 | 125 |
def log(rev: String = "", template: String = "", options: String = ""): String = |
64168 | 126 |
hg.command("log", opt_rev(rev) + opt_template(template), options).check.out |
64027 | 127 |
|
64348
4c253e84ae62
clarified push/pull chain: current ISABELLE_HOME may server as source for changes that are not published on isabelle_repos_source yet (e.g. isabelle-release branch);
wenzelm
parents:
64347
diff
changeset
|
128 |
def push(remote: String = "", rev: String = "", force: Boolean = false, options: String = "") |
4c253e84ae62
clarified push/pull chain: current ISABELLE_HOME may server as source for changes that are not published on isabelle_repos_source yet (e.g. isabelle-release branch);
wenzelm
parents:
64347
diff
changeset
|
129 |
{ |
4c253e84ae62
clarified push/pull chain: current ISABELLE_HOME may server as source for changes that are not published on isabelle_repos_source yet (e.g. isabelle-release branch);
wenzelm
parents:
64347
diff
changeset
|
130 |
hg.command("push", opt_rev(rev) + opt_flag("--force", force) + optional(remote), options). |
64408
50bcf976f276
clarified hg push return code: 1 means "nothing to push";
wenzelm
parents:
64348
diff
changeset
|
131 |
check_rc(rc => rc == 0 | rc == 1) |
64348
4c253e84ae62
clarified push/pull chain: current ISABELLE_HOME may server as source for changes that are not published on isabelle_repos_source yet (e.g. isabelle-release branch);
wenzelm
parents:
64347
diff
changeset
|
132 |
} |
4c253e84ae62
clarified push/pull chain: current ISABELLE_HOME may server as source for changes that are not published on isabelle_repos_source yet (e.g. isabelle-release branch);
wenzelm
parents:
64347
diff
changeset
|
133 |
|
63999 | 134 |
def pull(remote: String = "", rev: String = "", options: String = ""): Unit = |
64168 | 135 |
hg.command("pull", opt_rev(rev) + optional(remote), options).check |
63999 | 136 |
|
64168 | 137 |
def update( |
138 |
rev: String = "", clean: Boolean = false, check: Boolean = false, options: String = "") |
|
63999 | 139 |
{ |
64168 | 140 |
hg.command("update", |
141 |
opt_rev(rev) + opt_flag("--clean", clean) + opt_flag("--check", check), options).check |
|
63999 | 142 |
} |
65819
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
143 |
|
65822
17b8528c2f53
clarified notion of known files (before actual commit);
wenzelm
parents:
65819
diff
changeset
|
144 |
def known_files(): List[String] = |
65825
11f87ab51ddb
more robust command invocation, without defaults from hgrc;
wenzelm
parents:
65822
diff
changeset
|
145 |
hg.command("status", options = "--modified --added --clean --no-status").check.out_lines |
65819
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
146 |
|
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
147 |
def graph(): Graph[String, Unit] = |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
148 |
{ |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
149 |
val Node = """^node: (\w{12}) (\w{12}) (\w{12})""".r |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
150 |
val log_result = |
65825
11f87ab51ddb
more robust command invocation, without defaults from hgrc;
wenzelm
parents:
65822
diff
changeset
|
151 |
log(template = """node: {node|short} {p1node|short} {p2node|short}\n""") |
65819
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
152 |
(Graph.string[Unit] /: split_lines(log_result)) { |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
153 |
case (graph, Node(x, y, z)) => |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
154 |
val deps = List(y, z).filterNot(s => s.forall(_ == '0')) |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
155 |
val graph1 = (graph /: (x :: deps))(_.default_node(_, ())) |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
156 |
(graph1 /: deps)({ case (g, dep) => g.add_edge(dep, x) }) |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
157 |
case (graph, _) => graph |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
158 |
} |
ff3dc9325eaa
explore repository structure, with minimal assumptions about "hg log" output;
wenzelm
parents:
65818
diff
changeset
|
159 |
} |
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
160 |
} |
65832
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
161 |
|
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
162 |
|
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
163 |
/* unknown files */ |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
164 |
|
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
165 |
def unknown_files(files: List[Path], ssh: Option[SSH.Session] = None): List[Path] = |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
166 |
{ |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
167 |
val unknown = new mutable.ListBuffer[Path] |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
168 |
|
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
169 |
@tailrec def check(paths: List[Path]) |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
170 |
{ |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
171 |
paths match { |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
172 |
case path :: rest => |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
173 |
find_repository(path, ssh) match { |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
174 |
case None => unknown += path; check(rest) |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
175 |
case Some(hg) => |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
176 |
val known = |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
177 |
hg.known_files().iterator.map(name => |
65833 | 178 |
(hg.root + Path.explode(name)).canonical_file).toSet |
179 |
if (!known(path.canonical_file)) unknown += path |
|
180 |
check(rest.filterNot(p => known(p.canonical_file))) |
|
65832
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
181 |
} |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
182 |
case Nil => |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
183 |
} |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
184 |
} |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
185 |
|
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
186 |
check(files) |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
187 |
unknown.toList |
2fb85623c386
implicitly check for unknown files (not part of a Mercurial repository);
wenzelm
parents:
65825
diff
changeset
|
188 |
} |
63997
e11ccb5aa82f
more formal Mercurial support (with the potential to upgrade to command server);
wenzelm
parents:
diff
changeset
|
189 |
} |