equal
deleted
inserted
replaced
90 |
90 |
91 "Created: / 10-12-2012 / 03:04:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
91 "Created: / 10-12-2012 / 03:04:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
92 ! |
92 ! |
93 |
93 |
94 changeset |
94 changeset |
95 "Return an HGChangeset on which the working copy is based on." |
95 "Return an HGChangesetId on which the working copy is based on. |
|
96 This is parent1" |
|
97 |
|
98 ^repository changesetWithId: self changesetId. |
|
99 |
|
100 "Created: / 13-11-2012 / 21:47:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
101 "Modified: / 08-03-2013 / 19:51:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
102 ! |
|
103 |
|
104 changesetId |
|
105 "Return an HGChangeset on which the working copy is based on. |
|
106 This is parent1" |
96 |
107 |
97 | id dirstate | |
108 | id dirstate | |
98 |
109 |
99 dirstate := root asFilename / '.hg' / 'dirstate'. |
110 dirstate := root asFilename / '.hg' / 'dirstate'. |
100 dirstate exists ifFalse:[ |
111 dirstate exists ifFalse:[ |
101 "No changeset yet - fresh repository" |
112 "No changeset yet - fresh repository" |
102 ^ HGChangeset null |
113 ^ HGChangesetId null |
103 ]. |
114 ]. |
104 |
115 |
105 dirstate readingFileDo:[:s| |
116 dirstate readingFileDo:[:s| |
106 s binary. |
117 s binary. |
107 id := HGChangesetId fromBytes: (s next: 20). |
118 id := HGChangesetId fromBytes: (s next: 20). |
108 ]. |
119 ]. |
109 |
120 |
110 ^repository changesetWithId: id. |
121 ^id. |
111 |
122 |
112 "Created: / 13-11-2012 / 21:47:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
123 "Created: / 08-03-2013 / 19:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
113 "Modified: / 14-01-2013 / 13:37:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
114 "Modified (comment): / 14-01-2013 / 16:17:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
115 ! |
124 ! |
116 |
125 |
117 conflicts |
126 conflicts |
118 "Return entries with conflicts (both resolved and unresolved)" |
127 "Return entries with conflicts (both resolved and unresolved)" |
119 |
128 |