From 403331c6b1291889f8e84ac38fb5f2796b89fd56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Passerini?= Date: Mon, 24 Oct 2016 12:28:01 +0200 Subject: [PATCH] Avoid using a branch's commit history (see #140). --- .../IceAbstractCommitWalk.class/instance/uptoBranch..st | 3 +++ Iceberg.package/IceBranch.class/instance/commitsNotIn..st | 5 ++++- Iceberg.package/IceBranch.class/properties.json | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranch..st diff --git a/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranch..st b/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranch..st new file mode 100644 index 0000000000..e7afec6423 --- /dev/null +++ b/Iceberg.package/IceAbstractCommitWalk.class/instance/uptoBranch..st @@ -0,0 +1,3 @@ +walk definition +uptoBranch: anIceBranch + self uptoCommit: anIceBranch lastCommit \ No newline at end of file diff --git a/Iceberg.package/IceBranch.class/instance/commitsNotIn..st b/Iceberg.package/IceBranch.class/instance/commitsNotIn..st index fe676bfce2..ea362959f4 100644 --- a/Iceberg.package/IceBranch.class/instance/commitsNotIn..st +++ b/Iceberg.package/IceBranch.class/instance/commitsNotIn..st @@ -1,3 +1,6 @@ commits commitsNotIn: anotherBranch - ^ self commits copyWithoutAll: anotherBranch commits \ No newline at end of file + ^ self repository newCommitWalk + fromBranch: self; + uptoBranch: anotherBranch; + commits diff --git a/Iceberg.package/IceBranch.class/properties.json b/Iceberg.package/IceBranch.class/properties.json index 9791e3375d..8eb53bb967 100644 --- a/Iceberg.package/IceBranch.class/properties.json +++ b/Iceberg.package/IceBranch.class/properties.json @@ -9,8 +9,8 @@ "name", "repository", "versionDictionary", - "commits", - "loading" ], + "loading", + "commits" ], "name" : "IceBranch", "pools" : [ ],