[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [patch1773] create tentative version of rebase patch directly
From:       Ben Franksen <bugs () darcs ! net>
Date:       2018-12-04 17:03:52
Message-ID: 1N8onW-1hWS3M35Ww-015qQi () mrelayeu ! kundenserver ! de
[Download RAW message or body]

New submission from Ben Franksen <ben.franksen@online.de>:

1 patch for repository http://darcs.net/screened:

patch 7d1959242e56ad44daea5cf59b1390bf71c1edbd
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Dec  4 15:00:03 CET 2018
  * create tentative version of rebase patch directly
  
  This is safer, since it means that concurrently running read-only operations
  can't see intermediate states.

----------
files: create-tentative-version-of-rebase-patch-directly.dpatch, patch-preview.txt, unnamed
messages: 20571
nosy: bf
status: needs-screening
title: create tentative version of rebase patch directly

__________________________________
Darcs bug tracker <bugs@darcs.net>
<http://bugs.darcs.net/patch1773>
__________________________________
["patch-preview.txt" (text/x-darcs-patch)]


[create tentative version of rebase patch directly
Ben Franksen <ben.franksen@online.de>**20181204140003
 Ignore-this: b0dc8905d6ad92e7198271f92603f27b7970701ef1d25aa4df535ca61cf1d6cfae178779bfe9d18d
 
 This is safer, since it means that concurrently running read-only operations
 can't see intermediate states.
] hunk ./src/Darcs/Repository/Hashed.hs 123
- -    , createRebase
+    , createTentativeRebase
hunk ./src/Darcs/Repository/Hashed.hs 925
- -        copyFile rebasePath tentativeRebasePath
- -          `catchIOError` \e ->
- -            if isDoesNotExistError e then do
- -              createRebase r'
- -              renameFile rebasePath tentativeRebasePath
- -            else
- -              fail $ show e
+        revertTentativeRebase r'
hunk ./src/Darcs/Repository/Hashed.hs 929
+revertTentativeRebase :: RepoPatch p => Repository rt p wR wU wR -> IO ()
+revertTentativeRebase repo =
+  copyFile rebasePath tentativeRebasePath
+  `catchIOError` \e ->
+    if isDoesNotExistError e then
+      createTentativeRebase repo
+    else
+      fail $ show e
+
hunk ./src/Darcs/Repository/Rebase.hs 14
- -    , createRebase
+    , createTentativeRebase
hunk ./src/Darcs/Repository/Rebase.hs 190
- -createRebase :: RepoPatch p => Repository rt p wR wU wR -> IO ()
- -createRebase r = writeRebaseFile rebasePath r (Items NilFL :: Suspended p wR wR)
+createTentativeRebase :: RepoPatch p => Repository rt p wR wU wR -> IO ()
+createTentativeRebase r = writeRebaseFile tentativeRebasePath r (Items NilFL :: Suspended p wR wR)


["create-tentative-version-of-rebase-patch-directly.dpatch" (application/x-darcs-patch)]
["unnamed" (text/plain)]

.





_______________________________________________
darcs-devel mailing list
darcs-devel@osuosl.org
https://lists.osuosl.org/mailman/listinfo/darcs-devel


[prev in list] [next in list] [prev in thread] [next in thread]