gitcoach-cli 1.0.13 → 1.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/i18n/locales/en.json +20 -2
- package/dist/i18n/locales/es.json +20 -2
- package/dist/i18n/locales/fr.json +20 -2
- package/dist/services/git-service.d.ts +2 -1
- package/dist/services/git-service.d.ts.map +1 -1
- package/dist/services/git-service.js +23 -2
- package/dist/services/git-service.js.map +1 -1
- package/dist/ui/menus/conflict-resolution-menu.d.ts +13 -0
- package/dist/ui/menus/conflict-resolution-menu.d.ts.map +1 -0
- package/dist/ui/menus/conflict-resolution-menu.js +204 -0
- package/dist/ui/menus/conflict-resolution-menu.js.map +1 -0
- package/dist/ui/menus/pull-menu.d.ts.map +1 -1
- package/dist/ui/menus/pull-menu.js +18 -7
- package/dist/ui/menus/pull-menu.js.map +1 -1
- package/dist/utils/version.d.ts +1 -1
- package/dist/utils/version.js +1 -1
- package/package.json +1 -1
|
@@ -201,7 +201,7 @@
|
|
|
201
201
|
"optionRebase": "Rebase (replay your commits on top)",
|
|
202
202
|
"conflictsDetected": "{{count}} file(s) have merge conflicts that need to be resolved.",
|
|
203
203
|
"conflictedFiles": "Files with conflicts:",
|
|
204
|
-
"resolveInstructions": "To resolve
|
|
204
|
+
"resolveInstructions": "To resolve conflicts:\n1. Open each conflicted file in your editor\n2. Look for conflict markers: <<<<<<< (your changes), ======= (separator), >>>>>>> (remote changes)\n3. Choose which version to keep (or combine both), then delete ALL markers\n4. Save the file\n5. Run 'git add' on each resolved file\n6. Run 'git commit' to finalize the merge",
|
|
205
205
|
"resolveOptions": "What would you like to do?",
|
|
206
206
|
"abortMerge": "Abort merge and restore previous state",
|
|
207
207
|
"abortSuccess": "Merge aborted successfully. Your branch is back to its previous state.",
|
|
@@ -212,7 +212,25 @@
|
|
|
212
212
|
"uncommittedOptions": "What would you like to do with your uncommitted changes?",
|
|
213
213
|
"optionCommit": "Commit changes first",
|
|
214
214
|
"optionStash": "Stash changes temporarily",
|
|
215
|
-
"optionContinue": "Continue anyway (risky)"
|
|
215
|
+
"optionContinue": "Continue anyway (risky)",
|
|
216
|
+
"guidedResolution": "Resolve conflicts step by step (guided)"
|
|
217
|
+
},
|
|
218
|
+
"conflicts": {
|
|
219
|
+
"title": "Conflict Resolution",
|
|
220
|
+
"fileProgress": "File {{current}}/{{total}}:",
|
|
221
|
+
"localVersion": "Your version (local):",
|
|
222
|
+
"remoteVersion": "Remote version:",
|
|
223
|
+
"chooseResolution": "What do you want to keep?",
|
|
224
|
+
"keepLocal": "Keep my version (local)",
|
|
225
|
+
"keepRemote": "Keep the remote version",
|
|
226
|
+
"keepBoth": "Keep both (combine)",
|
|
227
|
+
"editManually": "Edit manually in my editor",
|
|
228
|
+
"fileResolved": "{{file}} resolved ({{current}}/{{total}})",
|
|
229
|
+
"allResolved": "All {{count}} conflict(s) resolved!",
|
|
230
|
+
"finalizeCommit": "Finalize the merge with git commit?",
|
|
231
|
+
"markersRemaining": "Conflict markers still found in {{file}}. Please remove all <<<<<<< ======= >>>>>>> markers.",
|
|
232
|
+
"pressEnterWhenDone": "Press Enter when you are done editing...",
|
|
233
|
+
"editInstructions": "Open {{file}} in your editor, resolve the conflicts, save, then come back here."
|
|
216
234
|
},
|
|
217
235
|
"branch": {
|
|
218
236
|
"title": "Branch Management",
|
|
@@ -201,7 +201,7 @@
|
|
|
201
201
|
"optionRebase": "Rebase (reaplica tus commits encima)",
|
|
202
202
|
"conflictsDetected": "{{count}} archivo(s) tienen conflictos de fusion que necesitan ser resueltos.",
|
|
203
203
|
"conflictedFiles": "Archivos con conflictos:",
|
|
204
|
-
"resolveInstructions": "Para resolver
|
|
204
|
+
"resolveInstructions": "Para resolver los conflictos:\n1. Abra cada archivo en conflicto en su editor\n2. Busque los marcadores de conflicto: <<<<<<< (sus cambios), ======= (separador), >>>>>>> (cambios remotos)\n3. Elija que version conservar (o combine ambas), luego elimine TODOS los marcadores\n4. Guarde el archivo\n5. Ejecute 'git add' en cada archivo resuelto\n6. Ejecute 'git commit' para finalizar el merge",
|
|
205
205
|
"resolveOptions": "Que te gustaria hacer?",
|
|
206
206
|
"abortMerge": "Abortar merge y restaurar el estado anterior",
|
|
207
207
|
"abortSuccess": "Merge abortado exitosamente. Tu rama volvio a su estado anterior.",
|
|
@@ -212,7 +212,25 @@
|
|
|
212
212
|
"uncommittedOptions": "Que quieres hacer con tus cambios sin commitear?",
|
|
213
213
|
"optionCommit": "Commitear primero",
|
|
214
214
|
"optionStash": "Guardar temporalmente (stash)",
|
|
215
|
-
"optionContinue": "Continuar de todos modos (riesgoso)"
|
|
215
|
+
"optionContinue": "Continuar de todos modos (riesgoso)",
|
|
216
|
+
"guidedResolution": "Resolver conflictos paso a paso (guiado)"
|
|
217
|
+
},
|
|
218
|
+
"conflicts": {
|
|
219
|
+
"title": "Resolucion de Conflictos",
|
|
220
|
+
"fileProgress": "Archivo {{current}}/{{total}}:",
|
|
221
|
+
"localVersion": "Tu version (local):",
|
|
222
|
+
"remoteVersion": "Version remota:",
|
|
223
|
+
"chooseResolution": "Que quieres conservar?",
|
|
224
|
+
"keepLocal": "Conservar mi version (local)",
|
|
225
|
+
"keepRemote": "Conservar la version remota",
|
|
226
|
+
"keepBoth": "Conservar ambas (combinar)",
|
|
227
|
+
"editManually": "Editar manualmente en mi editor",
|
|
228
|
+
"fileResolved": "{{file}} resuelto ({{current}}/{{total}})",
|
|
229
|
+
"allResolved": "Los {{count}} conflicto(s) han sido resueltos!",
|
|
230
|
+
"finalizeCommit": "Finalizar el merge con git commit?",
|
|
231
|
+
"markersRemaining": "Aun se encuentran marcadores de conflicto en {{file}}. Elimine todos los marcadores <<<<<<< ======= >>>>>>>.",
|
|
232
|
+
"pressEnterWhenDone": "Presione Enter cuando haya terminado de editar...",
|
|
233
|
+
"editInstructions": "Abra {{file}} en su editor, resuelva los conflictos, guarde y vuelva aqui."
|
|
216
234
|
},
|
|
217
235
|
"branch": {
|
|
218
236
|
"title": "Gestion de Ramas",
|
|
@@ -201,7 +201,7 @@
|
|
|
201
201
|
"optionRebase": "Rebase (rejoue vos commits par-dessus)",
|
|
202
202
|
"conflictsDetected": "{{count}} fichier(s) ont des conflits de fusion a resoudre.",
|
|
203
203
|
"conflictedFiles": "Fichiers en conflit :",
|
|
204
|
-
"resolveInstructions": "Pour resoudre
|
|
204
|
+
"resolveInstructions": "Pour resoudre les conflits :\n1. Ouvrez chaque fichier en conflit dans votre editeur\n2. Cherchez les marqueurs de conflit : <<<<<<< (vos modifications), ======= (separateur), >>>>>>> (modifications distantes)\n3. Choisissez la version a garder (ou combinez les deux), puis supprimez TOUS les marqueurs\n4. Sauvegardez le fichier\n5. Lancez 'git add' sur chaque fichier resolu\n6. Lancez 'git commit' pour finaliser le merge",
|
|
205
205
|
"resolveOptions": "Que souhaitez-vous faire ?",
|
|
206
206
|
"abortMerge": "Annuler le merge et restaurer l'etat precedent",
|
|
207
207
|
"abortSuccess": "Merge annule avec succes. Votre branche est revenue a son etat precedent.",
|
|
@@ -212,7 +212,25 @@
|
|
|
212
212
|
"uncommittedOptions": "Que faire de vos modifications non commitees ?",
|
|
213
213
|
"optionCommit": "Commiter d'abord",
|
|
214
214
|
"optionStash": "Mettre de cote temporairement (stash)",
|
|
215
|
-
"optionContinue": "Continuer quand meme (risque)"
|
|
215
|
+
"optionContinue": "Continuer quand meme (risque)",
|
|
216
|
+
"guidedResolution": "Resoudre les conflits pas a pas (guide)"
|
|
217
|
+
},
|
|
218
|
+
"conflicts": {
|
|
219
|
+
"title": "Resolution des Conflits",
|
|
220
|
+
"fileProgress": "Fichier {{current}}/{{total}} :",
|
|
221
|
+
"localVersion": "Votre version (locale) :",
|
|
222
|
+
"remoteVersion": "Version distante :",
|
|
223
|
+
"chooseResolution": "Que voulez-vous garder ?",
|
|
224
|
+
"keepLocal": "Garder ma version (locale)",
|
|
225
|
+
"keepRemote": "Garder la version distante",
|
|
226
|
+
"keepBoth": "Garder les deux (combiner)",
|
|
227
|
+
"editManually": "Editer manuellement dans mon editeur",
|
|
228
|
+
"fileResolved": "{{file}} resolu ({{current}}/{{total}})",
|
|
229
|
+
"allResolved": "Les {{count}} conflit(s) ont ete resolus !",
|
|
230
|
+
"finalizeCommit": "Finaliser le merge avec git commit ?",
|
|
231
|
+
"markersRemaining": "Des marqueurs de conflit sont encore presents dans {{file}}. Supprimez tous les marqueurs <<<<<<< ======= >>>>>>>.",
|
|
232
|
+
"pressEnterWhenDone": "Appuyez sur Entree quand vous avez fini d'editer...",
|
|
233
|
+
"editInstructions": "Ouvrez {{file}} dans votre editeur, resolvez les conflits, sauvegardez, puis revenez ici."
|
|
216
234
|
},
|
|
217
235
|
"branch": {
|
|
218
236
|
"title": "Gestion des Branches",
|
|
@@ -43,6 +43,7 @@ declare class GitService {
|
|
|
43
43
|
add(files: string | string[]): Promise<void>;
|
|
44
44
|
addAll(): Promise<void>;
|
|
45
45
|
commit(message: string): Promise<string>;
|
|
46
|
+
commitNoEdit(): Promise<string>;
|
|
46
47
|
push(remote?: string, branch?: string, force?: boolean, setUpstream?: boolean): Promise<void>;
|
|
47
48
|
/**
|
|
48
49
|
* Check if there are local commits that haven't been pushed
|
|
@@ -54,7 +55,7 @@ declare class GitService {
|
|
|
54
55
|
* Returns -1 if no upstream is set (meaning all commits are unpushed)
|
|
55
56
|
*/
|
|
56
57
|
getUnpushedCommitCount(): Promise<number>;
|
|
57
|
-
pull(remote?: string, branch?: string): Promise<void>;
|
|
58
|
+
pull(remote?: string, branch?: string, options?: Record<string, null>): Promise<void>;
|
|
58
59
|
checkout(branch: string): Promise<void>;
|
|
59
60
|
createBranch(name: string, checkout?: boolean): Promise<void>;
|
|
60
61
|
deleteBranch(name: string, force?: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-service.d.ts","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,YAAY,EAA4B,UAAU,EAAE,MAAM,YAAY,CAAC;AAKtG,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,cAAM,UAAU;IACd,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,WAAW,CAAuD;gBAE9D,QAAQ,CAAC,EAAE,MAAM;IAI7B,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvC,eAAe,IAAI,IAAI;IAIjB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAU7B,SAAS,CAAC,QAAQ,GAAE,OAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAuBvD,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAIrC,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAK1C,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAKlC,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAgBpC,gBAAgB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAmBzC,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKnC,gBAAgB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKrC,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKzC,OAAO,CAAC,MAAM,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAOjD,cAAc,CAAC,MAAM,GAAE,OAAe,GAAG,OAAO,CAAC,UAAU,CAAC;IAO5D,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMxC,IAAI,CAAC,MAAM,GAAE,MAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe,EAAE,WAAW,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAa3H;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAkB5C;;;OAGG;IACG,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAkBzC,IAAI,CAAC,MAAM,GAAE,MAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"git-service.d.ts","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,6 +123,21 @@ class GitService {
|
|
|
123
123
|
this.invalidateCache();
|
|
124
124
|
return result.commit;
|
|
125
125
|
}
|
|
126
|
+
async commitNoEdit() {
|
|
127
|
+
try {
|
|
128
|
+
const result = await this.git.raw(['commit', '--no-edit']);
|
|
129
|
+
this.invalidateCache();
|
|
130
|
+
// Extract commit hash from output (e.g., "[main abc1234] Merge ...")
|
|
131
|
+
const match = result.match(/\[[\w/.-]+\s+([a-f0-9]+)\]/);
|
|
132
|
+
return match ? match[1] : 'unknown';
|
|
133
|
+
}
|
|
134
|
+
catch {
|
|
135
|
+
// Fallback: commit with explicit merge message
|
|
136
|
+
const result = await this.git.commit('Merge remote changes');
|
|
137
|
+
this.invalidateCache();
|
|
138
|
+
return result.commit;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
126
141
|
async push(remote = 'origin', branch, force = false, setUpstream = false) {
|
|
127
142
|
const currentBranch = branch || (await this.getCurrentBranch());
|
|
128
143
|
if (!currentBranch) {
|
|
@@ -176,12 +191,18 @@ class GitService {
|
|
|
176
191
|
return 0;
|
|
177
192
|
}
|
|
178
193
|
}
|
|
179
|
-
async pull(remote = 'origin', branch) {
|
|
194
|
+
async pull(remote = 'origin', branch, options) {
|
|
180
195
|
const currentBranch = branch || (await this.getCurrentBranch());
|
|
181
196
|
if (!currentBranch) {
|
|
182
197
|
throw new Error('Cannot pull: no branch specified and detached HEAD');
|
|
183
198
|
}
|
|
184
|
-
|
|
199
|
+
if (options) {
|
|
200
|
+
const optionFlags = Object.keys(options);
|
|
201
|
+
await this.git.pull(remote, currentBranch, optionFlags);
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
await this.git.pull(remote, currentBranch);
|
|
205
|
+
}
|
|
185
206
|
this.invalidateCache();
|
|
186
207
|
}
|
|
187
208
|
async checkout(branch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-service.js","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiE,MAAM,YAAY,CAAC;AACtG,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AA4B5C,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC,MAAM,UAAU;IACN,GAAG,CAAY;IACf,WAAW,GAAkD,IAAI,CAAC;IAE1E,YAAY,QAAiB;QAC3B,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,mBAAmB,CAAC,IAAY;QAC9B,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,eAAe;QACb,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS;QACb,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,WAAoB,IAAI;QACtC,IAAI,QAAQ,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,mBAAmB,EAAE,CAAC;YACpG,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAC/B,CAAC;QAED,MAAM,MAAM,GAAiB,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QAErD,MAAM,MAAM,GAAc;YACxB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACpF,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjE,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAC3D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,OAAO,GAAkB,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAiB,EAAE,CAAC;QAElC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5D,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI;gBACJ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,OAAO,GAAkB,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAiB,EAAE,CAAC;QAElC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5D,gEAAgE;YAChE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxD,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI;oBACJ,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;iBAClB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAkB,KAAK;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAkB,KAAK;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAwB;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB,QAAQ,EAAE,MAAe,EAAE,QAAiB,KAAK,EAAE,cAAuB,KAAK;QACzG,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAI,KAAK;YAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,WAAW;YAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAEvC,sCAAsC;YACtC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,OAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,6DAA6D;YAC7D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAChD,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;QACvB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YACrD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAEvC,yCAAyC;YACzC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,OAAO,MAAM,CAAC,KAAK,CAAC;YACtB,CAAC;YAED,+CAA+C;YAC/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACjC,OAAO,GAAG,CAAC,KAAK,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACpD,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB,QAAQ,EAAE,MAAe;QACnD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY,EAAE,WAAoB,IAAI;QACvD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY,EAAE,QAAiB,KAAK;QACrD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,WAAmB,EAAE;QAChC,MAAM,GAAG,GAAc,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM,EAAE,KAAK,CAAC,WAAW;SAC1B,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe,QAAQ;QACxC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAClD,OAAO,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,MAAM,EAAE,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC;QAC3D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY;QAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB,QAAQ;QACnC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAkC,OAAO,EAAE,MAAc,MAAM;QACzE,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAgB;QAC1B,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAgB,CAAC;QAChC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,QAAgB,CAAC;QAC/B,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,MAAc,MAAM;QACrD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,GAAW;QACvC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YACzD,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;YACxD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAC1B,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;gBAC7C,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YACzD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC;YACH,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACrE,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAC9D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC;YACH,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YACzD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAe;QAC/B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACvC,IAAI,MAAM,IAAI,MAAM,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;gBACxC,iCAAiC;gBACjC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;gBACrD,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAClD,OAAO,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;YACnD,CAAC;YACD,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAChD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAe,EAAE,SAAkB;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AAC3C,eAAe,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"git-service.js","sourceRoot":"","sources":["../../src/services/git-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface ConflictBlock {
|
|
2
|
+
localContent: string;
|
|
3
|
+
remoteContent: string;
|
|
4
|
+
startLine: number;
|
|
5
|
+
endLine: number;
|
|
6
|
+
}
|
|
7
|
+
export declare function parseConflictBlocks(fileContent: string): ConflictBlock[];
|
|
8
|
+
export declare function resolveConflictBlock(fileContent: string, block: ConflictBlock, choice: 'local' | 'remote' | 'both'): string;
|
|
9
|
+
export declare function hasConflictMarkers(content: string): boolean;
|
|
10
|
+
export declare function showConflictResolutionMenu(): Promise<{
|
|
11
|
+
resolved: boolean;
|
|
12
|
+
}>;
|
|
13
|
+
//# sourceMappingURL=conflict-resolution-menu.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflict-resolution-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/conflict-resolution-menu.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAkBD,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CAwCxE;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAClC,MAAM,CAqBR;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG3D;AAED,wBAAsB,0BAA0B,IAAI,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CA6JjF"}
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
import { readFileSync, writeFileSync } from 'fs';
|
|
2
|
+
import { t } from '../../i18n/index.js';
|
|
3
|
+
import { getTheme } from '../themes/index.js';
|
|
4
|
+
import { promptSelect, promptInput } from '../components/prompt.js';
|
|
5
|
+
import { successBox, warningBox, errorBox, infoBox } from '../components/box.js';
|
|
6
|
+
import { gitService } from '../../services/git-service.js';
|
|
7
|
+
import { logger } from '../../utils/logger.js';
|
|
8
|
+
import { mapGitError } from '../../utils/error-mapper.js';
|
|
9
|
+
const CONFLICT_START = '<<<<<<<';
|
|
10
|
+
const CONFLICT_SEPARATOR = '=======';
|
|
11
|
+
const CONFLICT_END = '>>>>>>>';
|
|
12
|
+
const UTF8_BOM = '\uFEFF';
|
|
13
|
+
function normalizeContent(content) {
|
|
14
|
+
// Strip UTF-8 BOM
|
|
15
|
+
if (content.startsWith(UTF8_BOM)) {
|
|
16
|
+
content = content.slice(1);
|
|
17
|
+
}
|
|
18
|
+
// Normalize CRLF to LF
|
|
19
|
+
return content.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
|
|
20
|
+
}
|
|
21
|
+
export function parseConflictBlocks(fileContent) {
|
|
22
|
+
const lines = normalizeContent(fileContent).split('\n');
|
|
23
|
+
const blocks = [];
|
|
24
|
+
let inConflict = false;
|
|
25
|
+
let inLocal = false;
|
|
26
|
+
let startLine = -1;
|
|
27
|
+
let localLines = [];
|
|
28
|
+
let remoteLines = [];
|
|
29
|
+
for (let i = 0; i < lines.length; i++) {
|
|
30
|
+
const line = lines[i];
|
|
31
|
+
if (line.startsWith(CONFLICT_START)) {
|
|
32
|
+
inConflict = true;
|
|
33
|
+
inLocal = true;
|
|
34
|
+
startLine = i;
|
|
35
|
+
localLines = [];
|
|
36
|
+
remoteLines = [];
|
|
37
|
+
}
|
|
38
|
+
else if (inConflict && line.startsWith(CONFLICT_SEPARATOR)) {
|
|
39
|
+
inLocal = false;
|
|
40
|
+
}
|
|
41
|
+
else if (inConflict && line.startsWith(CONFLICT_END)) {
|
|
42
|
+
blocks.push({
|
|
43
|
+
localContent: localLines.join('\n'),
|
|
44
|
+
remoteContent: remoteLines.join('\n'),
|
|
45
|
+
startLine,
|
|
46
|
+
endLine: i
|
|
47
|
+
});
|
|
48
|
+
inConflict = false;
|
|
49
|
+
inLocal = false;
|
|
50
|
+
}
|
|
51
|
+
else if (inConflict) {
|
|
52
|
+
if (inLocal) {
|
|
53
|
+
localLines.push(line);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
remoteLines.push(line);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return blocks;
|
|
61
|
+
}
|
|
62
|
+
export function resolveConflictBlock(fileContent, block, choice) {
|
|
63
|
+
const lines = normalizeContent(fileContent).split('\n');
|
|
64
|
+
let replacement;
|
|
65
|
+
switch (choice) {
|
|
66
|
+
case 'local':
|
|
67
|
+
replacement = block.localContent;
|
|
68
|
+
break;
|
|
69
|
+
case 'remote':
|
|
70
|
+
replacement = block.remoteContent;
|
|
71
|
+
break;
|
|
72
|
+
case 'both':
|
|
73
|
+
replacement = block.localContent + '\n' + block.remoteContent;
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
// Replace the conflict block (startLine through endLine inclusive)
|
|
77
|
+
const before = lines.slice(0, block.startLine);
|
|
78
|
+
const after = lines.slice(block.endLine + 1);
|
|
79
|
+
return [...before, replacement, ...after].join('\n');
|
|
80
|
+
}
|
|
81
|
+
export function hasConflictMarkers(content) {
|
|
82
|
+
const normalized = normalizeContent(content);
|
|
83
|
+
return normalized.includes(CONFLICT_START) && normalized.includes(CONFLICT_END);
|
|
84
|
+
}
|
|
85
|
+
export async function showConflictResolutionMenu() {
|
|
86
|
+
const theme = getTheme();
|
|
87
|
+
logger.raw('\n' + theme.title(t('commands.conflicts.title')) + '\n');
|
|
88
|
+
try {
|
|
89
|
+
const conflictedFiles = await gitService.getConflictedFiles();
|
|
90
|
+
if (conflictedFiles.length === 0) {
|
|
91
|
+
logger.raw(infoBox(t('commands.pull.upToDate')));
|
|
92
|
+
return { resolved: true };
|
|
93
|
+
}
|
|
94
|
+
const total = conflictedFiles.length;
|
|
95
|
+
let resolvedCount = 0;
|
|
96
|
+
for (let i = 0; i < conflictedFiles.length; i++) {
|
|
97
|
+
const file = conflictedFiles[i];
|
|
98
|
+
const current = i + 1;
|
|
99
|
+
logger.raw('\n' + theme.textBold(t('commands.conflicts.fileProgress', { current, total })));
|
|
100
|
+
logger.raw(theme.file(file, 'conflict') + '\n');
|
|
101
|
+
let fileContent;
|
|
102
|
+
try {
|
|
103
|
+
fileContent = readFileSync(file, 'utf-8');
|
|
104
|
+
}
|
|
105
|
+
catch {
|
|
106
|
+
logger.raw(warningBox(mapGitError(new Error(`Cannot read file: ${file}`))));
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
const blocks = parseConflictBlocks(fileContent);
|
|
110
|
+
if (blocks.length === 0) {
|
|
111
|
+
// No conflict markers found - file may already be resolved
|
|
112
|
+
logger.raw(theme.textMuted(` ${file}: no conflict markers found`));
|
|
113
|
+
await gitService.add(file);
|
|
114
|
+
resolvedCount++;
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
117
|
+
// Resolve blocks from last to first to preserve line numbers
|
|
118
|
+
const blocksReversed = [...blocks].reverse();
|
|
119
|
+
for (const block of blocksReversed) {
|
|
120
|
+
// Display the two versions
|
|
121
|
+
logger.raw(theme.info(t('commands.conflicts.localVersion')));
|
|
122
|
+
logger.raw(theme.dim(' ' + (block.localContent || '(empty)').split('\n').join('\n ')));
|
|
123
|
+
logger.raw('');
|
|
124
|
+
logger.raw(theme.warning(t('commands.conflicts.remoteVersion')));
|
|
125
|
+
logger.raw(theme.dim(' ' + (block.remoteContent || '(empty)').split('\n').join('\n ')));
|
|
126
|
+
logger.raw('');
|
|
127
|
+
const choice = await promptSelect(t('commands.conflicts.chooseResolution'), [
|
|
128
|
+
{ name: t('commands.conflicts.keepLocal'), value: 'local' },
|
|
129
|
+
{ name: t('commands.conflicts.keepRemote'), value: 'remote' },
|
|
130
|
+
{ name: t('commands.conflicts.keepBoth'), value: 'both' },
|
|
131
|
+
{ name: t('commands.conflicts.editManually'), value: 'edit' },
|
|
132
|
+
{ name: t('menu.back'), value: 'back' }
|
|
133
|
+
]);
|
|
134
|
+
if (choice === 'back') {
|
|
135
|
+
return { resolved: false };
|
|
136
|
+
}
|
|
137
|
+
if (choice === 'edit') {
|
|
138
|
+
// Manual editing flow
|
|
139
|
+
logger.raw(infoBox(t('commands.conflicts.editInstructions', { file }), t('commands.conflicts.title')));
|
|
140
|
+
await promptInput(t('commands.conflicts.pressEnterWhenDone'), '');
|
|
141
|
+
// Re-read the file and check for remaining markers
|
|
142
|
+
try {
|
|
143
|
+
fileContent = readFileSync(file, 'utf-8');
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
logger.raw(warningBox(mapGitError(new Error(`Cannot read file: ${file}`))));
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
if (hasConflictMarkers(fileContent)) {
|
|
150
|
+
logger.raw(warningBox(t('commands.conflicts.markersRemaining', { file }), t('warnings.title')));
|
|
151
|
+
// Don't mark as resolved, let the user fix it
|
|
152
|
+
continue;
|
|
153
|
+
}
|
|
154
|
+
// File was manually resolved - break out of blocks loop for this file
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
// Apply automatic resolution
|
|
159
|
+
fileContent = resolveConflictBlock(fileContent, block, choice);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
// Write the resolved file (if not manually edited or if auto-resolved)
|
|
163
|
+
if (!hasConflictMarkers(fileContent)) {
|
|
164
|
+
try {
|
|
165
|
+
writeFileSync(file, fileContent, 'utf-8');
|
|
166
|
+
await gitService.add(file);
|
|
167
|
+
resolvedCount++;
|
|
168
|
+
logger.raw(successBox(t('commands.conflicts.fileResolved', { file, current, total }), t('success.title')));
|
|
169
|
+
}
|
|
170
|
+
catch (writeError) {
|
|
171
|
+
logger.raw(warningBox(mapGitError(writeError)));
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
// Summary
|
|
176
|
+
if (resolvedCount === total) {
|
|
177
|
+
logger.raw('\n' + successBox(t('commands.conflicts.allResolved', { count: total }), t('commands.conflicts.title')));
|
|
178
|
+
// Offer to finalize merge commit
|
|
179
|
+
const { promptConfirm } = await import('../components/prompt.js');
|
|
180
|
+
const finalize = await promptConfirm(t('commands.conflicts.finalizeCommit'), true);
|
|
181
|
+
if (finalize) {
|
|
182
|
+
try {
|
|
183
|
+
logger.command('git commit --no-edit');
|
|
184
|
+
const hash = await gitService.commitNoEdit();
|
|
185
|
+
logger.raw(successBox(`Merge commit: ${theme.commitHash(hash)}`, t('success.title')));
|
|
186
|
+
return { resolved: true };
|
|
187
|
+
}
|
|
188
|
+
catch (commitError) {
|
|
189
|
+
logger.raw(warningBox(mapGitError(commitError)));
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
return { resolved: true };
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
logger.raw(warningBox(`${resolvedCount}/${total} files resolved. Remaining files need manual resolution.`, t('commands.conflicts.title')));
|
|
196
|
+
return { resolved: false };
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
catch (error) {
|
|
200
|
+
logger.raw(errorBox(mapGitError(error)));
|
|
201
|
+
return { resolved: false };
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
//# sourceMappingURL=conflict-resolution-menu.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflict-resolution-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/conflict-resolution-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"pull-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CAiQxD"}
|
|
@@ -79,13 +79,15 @@ export async function showPullMenu() {
|
|
|
79
79
|
if (!status.isClean) {
|
|
80
80
|
logger.raw(warningBox(t('commands.pull.uncommittedWarning'), t('warnings.title')));
|
|
81
81
|
const uncommittedAction = await promptSelect(t('commands.pull.uncommittedOptions'), [
|
|
82
|
+
{ name: t('commands.pull.optionCommit'), value: 'commit' },
|
|
82
83
|
{ name: t('commands.pull.optionStash'), value: 'stash' },
|
|
83
|
-
{ name: t('commands.pull.optionContinue'), value: 'continue' }
|
|
84
|
-
{ name: theme.menuItem('R', t('menu.back')), value: 'commit' }
|
|
84
|
+
{ name: t('commands.pull.optionContinue'), value: 'continue' }
|
|
85
85
|
]);
|
|
86
86
|
if (uncommittedAction === 'commit') {
|
|
87
|
-
//
|
|
88
|
-
|
|
87
|
+
// Redirect to commit-menu, then re-run pull
|
|
88
|
+
const { showCommitMenu } = await import('./commit-menu.js');
|
|
89
|
+
await showCommitMenu();
|
|
90
|
+
return showPullMenu();
|
|
89
91
|
}
|
|
90
92
|
if (uncommittedAction === 'stash') {
|
|
91
93
|
await withSpinner(t('commands.stash.save'), async () => { await gitService.stash('Auto-stash before pull'); }, t('commands.stash.saveSuccess'));
|
|
@@ -118,7 +120,7 @@ export async function showPullMenu() {
|
|
|
118
120
|
logger.command(`git pull --rebase ${remote} ${currentBranch || ''}`);
|
|
119
121
|
try {
|
|
120
122
|
await withSpinner(t('commands.pull.pulling', { remote }), async () => {
|
|
121
|
-
await gitService.pull(remote, currentBranch || undefined);
|
|
123
|
+
await gitService.pull(remote, currentBranch || undefined, { '--rebase': null });
|
|
122
124
|
}, t('commands.pull.success', { count: updatedStatus.behind }));
|
|
123
125
|
}
|
|
124
126
|
catch (error) {
|
|
@@ -195,16 +197,25 @@ async function handlePostPullConflicts(theme, error) {
|
|
|
195
197
|
logger.raw(infoBox(t('commands.pull.resolveInstructions')));
|
|
196
198
|
// Offer options
|
|
197
199
|
const action = await promptSelect(t('commands.pull.resolveOptions'), [
|
|
200
|
+
{ name: t('commands.pull.guidedResolution'), value: 'guided' },
|
|
198
201
|
{ name: t('commands.pull.abortMerge'), value: 'abort' },
|
|
199
202
|
{ name: t('commands.pull.continueMerge'), value: 'manual' }
|
|
200
203
|
]);
|
|
204
|
+
if (action === 'guided') {
|
|
205
|
+
const { showConflictResolutionMenu } = await import('./conflict-resolution-menu.js');
|
|
206
|
+
const result = await showConflictResolutionMenu();
|
|
207
|
+
if (result.resolved) {
|
|
208
|
+
return { pulled: true };
|
|
209
|
+
}
|
|
210
|
+
return { pulled: false };
|
|
211
|
+
}
|
|
201
212
|
if (action === 'abort') {
|
|
202
213
|
try {
|
|
203
214
|
await gitService.abortMerge();
|
|
204
215
|
logger.raw(successBox(t('commands.pull.abortSuccess')));
|
|
205
216
|
}
|
|
206
|
-
catch {
|
|
207
|
-
logger.raw(warningBox(mapGitError(
|
|
217
|
+
catch (abortError) {
|
|
218
|
+
logger.raw(warningBox(mapGitError(abortError)));
|
|
208
219
|
}
|
|
209
220
|
}
|
|
210
221
|
return { pulled: false };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pull-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const APP_VERSION = "1.0.
|
|
1
|
+
export declare const APP_VERSION = "1.0.15";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/utils/version.js
CHANGED